rpms
/
qt5-qttools
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix build

This commit is contained in:
Jan Grulich 2019-12-09 20:08:04 +01:00
parent 1ba54e4a7c
commit 113097ab3e
2 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qt5-qttools.spec
View File

@ -265,10 +265,11 @@ popd
%files
%{_bindir}/qdbus-qt5
%{_bindir}/qtpaths
%{_bindir}/lprodump
%{_qt5_bindir}/qdbus
%{_qt5_bindir}/qdbus-qt5
%{_qt5_bindir}/qtpaths
%{_qt5_bindir}/lprodump
%files common
%license LICENSE.LGPL*
@ -352,6 +353,7 @@ fi
%{_qt5_bindir}/designer*
%{_datadir}/applications/*designer.desktop
%{_datadir}/icons/hicolor/*/apps/designer*.*
%{_qt5_libdir}/cmake/Qt5DesignerComponents/Qt5DesignerComponentsConfig*.cmake
%if 0%{?webkit}
%files -n qt5-designer-plugin-webkit

40
qttools-opensource-src-5.5.0-qmake-qt5.patch
View File

@ -1,27 +1,13 @@
diff -up qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp.qmake-qt5 qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp
--- qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp.qmake-qt5 2015-06-29 15:13:45.000000000 -0500
+++ qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp 2015-07-16 10:23:49.664773033 -0500
@@ -310,9 +310,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;
diff -up qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp.qmake-qt5 qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp
--- qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp.qmake-qt5 2015-06-29 15:13:46.000000000 -0500
+++ qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp 2015-07-16 10:23:49.665773055 -0500
@@ -1048,7 +1048,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(),
diff --git a/src/linguist/lprodump/main.cpp b/src/linguist/lprodump/main.cpp
index 857786b..2a65299 100644
--- a/src/linguist/lprodump/main.cpp
+++ b/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(),