Fabian Vogt
c72a8754eb
fix-for-opensuse-qmake-qt5.patch into add-qt5-suffix.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qttools?expand=0&rev=10
35 lines
1.6 KiB
Diff
35 lines
1.6 KiB
Diff
From: Fabian Vogt <fabian@ritter-vogt.de>
|
|
Subject: Add -qt5 suffix to executables
|
|
|
|
To allow parallel installation of different versions of Qt, binaries in $PATH
|
|
are suffixed.
|
|
|
|
Original authors are liujianfeng1994@gmail.com and jslaby@suse.cz.
|
|
|
|
---
|
|
Index: qttools-everywhere-src-5.13.0/src/linguist/lrelease-pro/main.cpp
|
|
===================================================================
|
|
--- qttools-everywhere-src-5.13.0.orig/src/linguist/lrelease-pro/main.cpp
|
|
+++ qttools-everywhere-src-5.13.0/src/linguist/lrelease-pro/main.cpp
|
|
@@ -145,6 +145,6 @@ int main(int argc, char **argv)
|
|
projectDescription->setAutoRemove(false);
|
|
lreleaseOptions << QStringLiteral("-project") << projectDescription->fileName();
|
|
|
|
- runQtTool(QStringLiteral("lrelease"), lreleaseOptions);
|
|
+ runQtTool(QStringLiteral("lrelease-qt5"), lreleaseOptions);
|
|
return 0;
|
|
}
|
|
Index: qttools-everywhere-src-5.13.0/src/linguist/lprodump/main.cpp
|
|
===================================================================
|
|
--- qttools-everywhere-src-5.13.0.orig/src/linguist/lprodump/main.cpp
|
|
+++ qttools-everywhere-src-5.13.0/src/linguist/lprodump/main.cpp
|
|
@@ -438,7 +438,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(),
|