2017-10-23 16:20:56 +02:00
|
|
|
Index: src/linguist/lrelease/main.cpp
|
|
|
|
===================================================================
|
|
|
|
--- src/linguist/lrelease/main.cpp.orig
|
|
|
|
+++ src/linguist/lrelease/main.cpp
|
|
|
|
@@ -305,9 +305,9 @@ int main(int argc, char **argv)
|
2015-01-21 21:52:56 +01:00
|
|
|
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-qt5");
|
|
|
|
#else
|
|
|
|
- option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake");
|
|
|
|
+ option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake-qt5");
|
|
|
|
#endif
|
|
|
|
option.initProperties();
|
|
|
|
QMakeVfs vfs;
|
2017-10-23 16:20:56 +02:00
|
|
|
Index: src/linguist/lupdate/main.cpp
|
|
|
|
===================================================================
|
|
|
|
--- src/linguist/lupdate/main.cpp.orig
|
|
|
|
+++ src/linguist/lupdate/main.cpp
|
|
|
|
@@ -1126,7 +1126,7 @@ int main(int argc, char **argv)
|
2015-01-21 21:52:56 +01:00
|
|
|
ProFileGlobals option;
|
|
|
|
option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE"));
|
|
|
|
if (option.qmake_abslocation.isEmpty())
|
|
|
|
- option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake");
|
|
|
|
+ option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake-qt5");
|
|
|
|
option.debugLevel = proDebug;
|
|
|
|
option.initProperties();
|
|
|
|
option.setCommandLineArguments(QDir::currentPath(),
|