summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-08-25 21:19:52 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-08-25 21:22:27 (GMT)
commit49e80b397feb8da5ee64f8dbc905c47723afbf5d (patch)
tree9bf2207bc3828a5b1847d9c407712b6f43ec83f4 /tests
parentb75cf3cc92f66a849d19b1ea656124f15245c3ce (diff)
downloadQt-49e80b397feb8da5ee64f8dbc905c47723afbf5d.zip
Qt-49e80b397feb8da5ee64f8dbc905c47723afbf5d.tar.gz
Qt-49e80b397feb8da5ee64f8dbc905c47723afbf5d.tar.bz2
Use the full path to qmake in the qmake unit test
Reviewed-By: ossi
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qmake/tst_qmake.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qmake/tst_qmake.cpp b/tests/auto/qmake/tst_qmake.cpp
index 277e9f8..1d3e128 100644
--- a/tests/auto/qmake/tst_qmake.cpp
+++ b/tests/auto/qmake/tst_qmake.cpp
@@ -99,7 +99,8 @@ private:
tst_qmake::tst_qmake()
{
- QString cmd = QString("qmake \"QT_VERSION=%1\"").arg(QT_VERSION);
+ QString binpath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
+ QString cmd = QString("%2/qmake \"QT_VERSION=%1\"").arg(QT_VERSION).arg(binpath);
#ifdef Q_CC_MSVC
test_compiler.setBaseCommands( "nmake", cmd );
#elif defined(Q_CC_MINGW)