diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-26 16:08:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-26 16:08:56 (GMT) |
| commit | 5f7e7f41abbb8ab2f2e8f076e0a1a5a2bad0c520 (patch) | |
| tree | 8d7c73e82b88b7d09195b8edc34eb2ca678608a4 /tools/qtestlib/wince | |
| parent | 20ff096f7928af788b6fdcce3e7de688120b060c (diff) | |
| parent | 74c9e76e0c53e60ad340bb002c4efa6ecd57cd58 (diff) | |
| download | Qt-5f7e7f41abbb8ab2f2e8f076e0a1a5a2bad0c520.zip Qt-5f7e7f41abbb8ab2f2e8f076e0a1a5a2bad0c520.tar.gz Qt-5f7e7f41abbb8ab2f2e8f076e0a1a5a2bad0c520.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'tools/qtestlib/wince')
| -rw-r--r-- | tools/qtestlib/wince/cetest/activesyncconnection.cpp | 2 | ||||
| -rw-r--r-- | tools/qtestlib/wince/cetest/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/qtestlib/wince/cetest/activesyncconnection.cpp b/tools/qtestlib/wince/cetest/activesyncconnection.cpp index 98062ed..812ed47 100644 --- a/tools/qtestlib/wince/cetest/activesyncconnection.cpp +++ b/tools/qtestlib/wince/cetest/activesyncconnection.cpp @@ -247,7 +247,7 @@ bool ActiveSyncConnection::copyFileFromDevice(const QString &deviceSource, const wprintf(L"\n"); if (!readUntilEnd) { - debugOutput(QString::fromLatin1(" an error occured during copy"), 2); + debugOutput(QString::fromLatin1(" an error occurred during copy"), 2); return false; } diff --git a/tools/qtestlib/wince/cetest/main.cpp b/tools/qtestlib/wince/cetest/main.cpp index 4272a83..ec62af1 100644 --- a/tools/qtestlib/wince/cetest/main.cpp +++ b/tools/qtestlib/wince/cetest/main.cpp @@ -283,7 +283,7 @@ int main(int argc, char **argv) cout << "Error: Can only test executables!" << endl; return -1; } - // Check wether the project is still in debug/release mode after reading + // Check whether the project is still in debug/release mode after reading // If .pro specifies to be one mode only, we need to accept this if (project.isActiveConfig("debug") && !project.isActiveConfig("release")) { TestConfiguration::testDebug = true; |