summaryrefslogtreecommitdiffstats
path: root/tests/arthur
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2010-11-08 14:28:44 (GMT)
committeraavit <qt-info@nokia.com>2010-11-08 14:28:44 (GMT)
commit6dbcb6c96f55e1fa41af8a3aedb60d7d1edb1c33 (patch)
tree1ccdafbb1ace1524f31282a9c2eec0fc241e849a /tests/arthur
parent5307798688898b73e953276bbac36be5549728d7 (diff)
downloadQt-6dbcb6c96f55e1fa41af8a3aedb60d7d1edb1c33.zip
Qt-6dbcb6c96f55e1fa41af8a3aedb60d7d1edb1c33.tar.gz
Qt-6dbcb6c96f55e1fa41af8a3aedb60d7d1edb1c33.tar.bz2
Get the qmakespec correctly on all platforms
Diffstat (limited to 'tests/arthur')
-rw-r--r--tests/arthur/common/baselineprotocol.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/arthur/common/baselineprotocol.cpp b/tests/arthur/common/baselineprotocol.cpp
index 3e60011..3fdef88 100644
--- a/tests/arthur/common/baselineprotocol.cpp
+++ b/tests/arthur/common/baselineprotocol.cpp
@@ -46,6 +46,7 @@
#include <QSysInfo>
#include <QProcess>
#include <QFileInfo>
+#include <QDir>
#ifndef QMAKESPEC
#define QMAKESPEC "Unknown"
@@ -57,7 +58,8 @@ PlatformInfo::PlatformInfo(bool useLocal)
if (useLocal) {
insert(PI_HostName, QHostInfo::localHostName());
insert(PI_QtVersion, QLS(qVersion()));
- insert(PI_QMakeSpec, QFileInfo(QLS(QMAKESPEC)).fileName());
+ QString mkspec = QDir::fromNativeSeparators(QLS(QMAKESPEC)).remove(QRegExp(QLS("^.*/mkspecs/")));
+ insert(PI_QMakeSpec, mkspec);
insert(PI_BuildKey, QLibraryInfo::buildKey());
#if defined(Q_OS_LINUX)
insert(PI_OSName, QLS("Linux"));