Changeset 769 for trunk/tools/qtestlib

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/qtestlib/wince/cetest/activesyncconnection.cpp (modified) (1 diff)
• tools/qtestlib/wince/cetest/activesyncconnection.h (modified) (1 diff)
• tools/qtestlib/wince/cetest/cetest.pro (modified) (2 diffs)
• tools/qtestlib/wince/cetest/main.cpp (modified) (5 diffs)
• tools/qtestlib/wince/cetest/qmake_include.pri (modified) (1 diff)
• tools/qtestlib/wince/remotelib/commands.cpp (modified) (2 diffs)
• tools/qtestlib/wince/remotelib/commands.h (modified) (1 diff)

trunk/tools/qtestlib/wince/cetest/activesyncconnection.cpp

@@ -444 +444 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 bool ActiveSyncConnection::createDirectory(const QString &path, bool deleteBefore)
 {

trunk/tools/qtestlib/wince/cetest/activesyncconnection.h

@@ -80 +80 @@
 
     bool execute(QString program, QString arguments = QString(), int timeout = -1, int *returnValue = NULL);
+
+
+
 private:
     bool connected;

trunk/tools/qtestlib/wince/cetest/cetest.pro

@@ -20 +20 @@
               $$QT_SOURCE_TREE/qmake \
               $$QT_SOURCE_TREE/qmake/generators/symbian \
+
               $$QT_BUILD_TREE/include \
               $$QT_BUILD_TREE/include/QtCore \
               $$QT_BUILD_TREE/src/corelib/global
+
+
 
 DEPENDPATH += $$QT_BUILD_TREE/src/corelib/tools $$QT_BUILD_TREE/src/corelib/io
@@ -34 +37 @@
         remoteconnection.cpp \
         deployment.cpp \
+
+
         main.cpp
 

trunk/tools/qtestlib/wince/cetest/main.cpp

@@ -45 +45 @@
 #   include "activesyncconnection.h"
 #endif
+
+
+
 
 #include "deployment.h"
@@ -124 +127 @@
         " -release          : Test release version\n"
         " -libpath <path>   : Remote path to deploy Qt libraries to\n"
+
+
         " -qt-delete        : Delete the Qt libraries after execution\n"
         " -project-delete   : Delete the project file(s) after execution\n"
@@ -153 +158 @@
     bool cleanupQt = false;
     bool cleanupProject = false;
+
+
 
     for (int i=1; i<arguments.size(); ++i) {
@@ -197 +204 @@
             cleanupQt = true;
             cleanupProject = true;
+
+
+
+
         } else if (arguments.at(i).toLower() == QLatin1String("-conf")) {
             if (++i == arguments.size()) {
@@ -353 +364 @@
         cout << "Error: Could not copy file(s) to device" << endl;
         return -1;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 

trunk/tools/qtestlib/wince/cetest/qmake_include.pri

@@ -6 +6 @@
            $$QT_SOURCE_TREE/qmake/project.cpp \
            $$QT_SOURCE_TREE/qmake/property.cpp \
-           $$QT_SOURCE_TREE/qmake/generators/symbian/initprojectdeploy_symbian.cpp
+           $$QT_SOURCE_TREE/qmake/generators/symbian/initprojectdeploy_symbian.cpp \
+           $$QT_SOURCE_TREE/tools/shared/symbian/epocroot.cpp \
+           $$QT_SOURCE_TREE/tools/shared/windows/registry.cpp
 

trunk/tools/qtestlib/wince/remotelib/commands.cpp

@@ -40 +40 @@
 ****************************************************************************/
 #include "commands.h"
+
+
+
 
 #define CLEAN_FAIL(a) {delete appName; \
@@ -125 +128 @@
     return true;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/tools/qtestlib/wince/remotelib/commands.h

@@ -46 +46 @@
 extern "C" {
     int __declspec(dllexport) qRemoteLaunch(DWORD, BYTE*, DWORD*, BYTE**, IRAPIStream*);
+
+
+
     bool __declspec(dllexport) qRemoteExecute(const wchar_t* program, const wchar_t* arguments = NULL, int *returnValue = NULL , DWORD* error = NULL, int timeout = -1);
 }