forked from pool/libqt5-qttools
290a4b5940
Qt 5.9.2 OBS-URL: https://build.opensuse.org/request/show/533923 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qttools?expand=0&rev=33
30 lines
1.5 KiB
Diff
30 lines
1.5 KiB
Diff
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)
|
|
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;
|
|
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)
|
|
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(),
|