make uninstalled lupdate & lrelease find qmake

Change-Id: Ifbbb0be43f20a0def3fed1a32018faa17275a095
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

diff --git a/src/linguist/lrelease/lrelease.pro b/src/linguist/lrelease/lrelease.pro
index ab281e3..debbc98 100644 (file)
--- a/src/linguist/lrelease/lrelease.pro
+++ b/src/linguist/lrelease/lrelease.pro
@@ -8,4 +8,8 @@ SOURCES += main.cpp
 include(../shared/formats.pri)
 include(../shared/proparser.pri)
 
+qmake.name = QMAKE
+qmake.value = $$shell_path($$QMAKE_QMAKE)
+QT_TOOL_ENV += qmake
+
 load(qt_tool)

diff --git a/src/linguist/lrelease/main.cpp b/src/linguist/lrelease/main.cpp
index 3ce67ed..0a086a9 100644 (file)
--- a/src/linguist/lrelease/main.cpp
+++ b/src/linguist/lrelease/main.cpp
@@ -308,10 +308,12 @@ int main(int argc, char **argv)
 
             evalHandler.verbose = cd.isVerbose();
             ProFileGlobals option;
+            option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE"));
+            if (option.qmake_abslocation.isEmpty())
 #ifdef QT_BOOTSTRAPPED
-            option.qmake_abslocation = binDir + QLatin1String("/qmake");
+                option.qmake_abslocation = binDir + QLatin1String("/qmake");
 #else
-            option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake");
+                option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake");
 #endif
             option.initProperties();
             QMakeParser parser(0, &evalHandler);

diff --git a/src/linguist/lupdate/lupdate.pro b/src/linguist/lupdate/lupdate.pro
index 9744893..40a9daf 100644 (file)
--- a/src/linguist/lupdate/lupdate.pro
+++ b/src/linguist/lupdate/lupdate.pro
@@ -36,4 +36,8 @@ embed_manifest_exe:win32-msvc2005 {
     QMAKE_POST_LINK += $$quote(mt.exe -updateresource:$$DESTDIR/lupdate.exe -manifest \"$${PWD}\\lupdate.exe.manifest\")
 }
 
+qmake.name = QMAKE
+qmake.value = $$shell_path($$QMAKE_QMAKE)
+QT_TOOL_ENV += qmake
+
 load(qt_tool)

diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp
index 191b1d1..d9140ab 100644 (file)
--- a/src/linguist/lupdate/main.cpp
+++ b/src/linguist/lupdate/main.cpp
@@ -833,7 +833,9 @@ int main(int argc, char **argv)
 
         evalHandler.verbose = !!(options & Verbose);
         ProFileGlobals option;
-        option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake");
+        option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE"));
+        if (option.qmake_abslocation.isEmpty())
+            option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake");
         option.initProperties();
         option.setCommandLineArguments(QDir::currentPath(),
                                        QStringList() << QLatin1String("CONFIG+=lupdate_run"));