forked from pool/libqt5-qttools
28 lines
1.5 KiB
Diff
28 lines
1.5 KiB
Diff
|
diff -ru src.org/linguist/lrelease/main.cpp src/linguist/lrelease/main.cpp
|
||
|
|
--- src.org/linguist/lrelease/main.cpp 2014-12-06 00:24:59.000000000 +0800
|
||
|
|
+++ src/linguist/lrelease/main.cpp 2015-01-12 10:50:16.717756760 +0800
|
||
|
|
@@ -310,9 +310,9 @@
|
||
|
|
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;
|
||
|
|
diff -ru src.org/linguist/lupdate/main.cpp src/linguist/lupdate/main.cpp
|
||
|
|
--- src.org/linguist/lupdate/main.cpp 2014-12-06 00:24:59.000000000 +0800
|
||
|
|
+++ src/linguist/lupdate/main.cpp 2015-01-12 10:50:16.718756760 +0800
|
||
|
|
@@ -1048,7 +1048,7 @@
|
||
|
|
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(),
|