diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-09 16:01:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-09 16:01:09 (GMT) |
| commit | 33c664c2bfcd3dd7a56bb693949a5cbf797799f4 (patch) | |
| tree | cb7f975a7c3e38057b5fac96f0bc23ec6897087e | |
| parent | e4aa7e8f270bb722c458a0e4a756a159ab695a9c (diff) | |
| parent | d25330abf4bfe73b7c2867923c461a762747c485 (diff) | |
| download | Qt-33c664c2bfcd3dd7a56bb693949a5cbf797799f4.zip Qt-33c664c2bfcd3dd7a56bb693949a5cbf797799f4.tar.gz Qt-33c664c2bfcd3dd7a56bb693949a5cbf797799f4.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Really fix getting qmakespec on windows
| -rw-r--r-- | tests/arthur/common/baselineprotocol.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/lancelot/lancelot.pro | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/arthur/common/baselineprotocol.cpp b/tests/arthur/common/baselineprotocol.cpp index 3fdef88..2a41104 100644 --- a/tests/arthur/common/baselineprotocol.cpp +++ b/tests/arthur/common/baselineprotocol.cpp @@ -58,8 +58,7 @@ PlatformInfo::PlatformInfo(bool useLocal) if (useLocal) { insert(PI_HostName, QHostInfo::localHostName()); insert(PI_QtVersion, QLS(qVersion())); - QString mkspec = QDir::fromNativeSeparators(QLS(QMAKESPEC)).remove(QRegExp(QLS("^.*/mkspecs/"))); - insert(PI_QMakeSpec, mkspec); + insert(PI_QMakeSpec, QString(QLS(QMAKESPEC)).remove(QRegExp(QLS("^.*mkspecs/")))); insert(PI_BuildKey, QLibraryInfo::buildKey()); #if defined(Q_OS_LINUX) insert(PI_OSName, QLS("Linux")); diff --git a/tests/auto/lancelot/lancelot.pro b/tests/auto/lancelot/lancelot.pro index 6498f6c..4535b83 100644 --- a/tests/auto/lancelot/lancelot.pro +++ b/tests/auto/lancelot/lancelot.pro @@ -8,6 +8,8 @@ HEADERS += $$QT_SOURCE_TREE/tests/arthur/common/paintcommands.h RESOURCES += $$QT_SOURCE_TREE/tests/arthur/common/images.qrc include($$QT_SOURCE_TREE/tests/arthur/common/baselineprotocol.pri) -DEFINES += QMAKESPEC=\\\"$$QMAKESPEC\\\" +win32|symbian*:MKSPEC=$$replace(QMAKESPEC, \\\\, /) +else:MKSPEC=$$QMAKESPEC +DEFINES += QMAKESPEC=\\\"$$MKSPEC\\\" !symbian:!wince*:DEFINES += SRCDIR=\\\"$$PWD\\\" |