diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-24 14:55:58 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-01 16:37:26 +0200 |
| commit | c6d640d3cd29d2f9ba6d8edfd1853035daa8a802 (patch) | |
| tree | 44f36be9889d6eb7ad23618353d431ed961b7f0a /tests/manual/proparser | |
| parent | 467a08127dc1ed2334d5512825ae61ffc467982c (diff) | |
| download | qt-creator-c6d640d3cd29d2f9ba6d8edfd1853035daa8a802.tar.gz | |
allow override of qmake executable in testreader
that way even a testreader built against qt 4 can use qt 5 qmake.
Change-Id: I55636dc22bd13cd7dcdff7381e4f0162592bb781
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'tests/manual/proparser')
| -rw-r--r-- | tests/manual/proparser/main.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/manual/proparser/main.cpp b/tests/manual/proparser/main.cpp index e7c4bafbf0..b686672104 100644 --- a/tests/manual/proparser/main.cpp +++ b/tests/manual/proparser/main.cpp @@ -154,8 +154,10 @@ int main(int argc, char **argv) qFatal("need at least two arguments: [-v] <cumulative?> <filenme> [<out_pwd> [<qmake options>]]"); QMakeGlobals option; - option.qmake_abslocation = - QDir::cleanPath(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/qmake")); + QString qmake = QString::fromLocal8Bit(qgetenv("TESTREADER_QMAKE")); + if (qmake.isEmpty()) + qmake = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/qmake"); + option.qmake_abslocation = QDir::cleanPath(qmake); option.initProperties(); if (args.count() >= 4) option.setCommandLineArguments(args.mid(3)); |