qt5-qttools/qttools-opensource-src-5.2.0-qmake-qt5.patch

28 lines
1.9 KiB
Diff
Raw Normal View History

2013-12-02 17:34:33 +00:00
diff -up qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp.qmake-qt5 qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp
--- qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp.qmake-qt5 2013-11-26 19:01:52.000000000 -0600
+++ qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp 2013-12-02 11:33:01.346611970 -0600
@@ -318,9 +318,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;
2013-12-02 17:34:33 +00:00
diff -up qttools-opensource-src-5.2.0-rc1/src/linguist/lupdate/main.cpp.qmake-qt5 qttools-opensource-src-5.2.0-rc1/src/linguist/lupdate/main.cpp
--- qttools-opensource-src-5.2.0-rc1/src/linguist/lupdate/main.cpp.qmake-qt5 2013-11-26 19:01:52.000000000 -0600
+++ qttools-opensource-src-5.2.0-rc1/src/linguist/lupdate/main.cpp 2013-12-02 11:33:01.347611960 -0600
@@ -1070,7 +1070,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(),