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

lupdate can't find qmake configuration file default (#1009893)

This commit is contained in:
Rex Dieter 2013-09-21 01:03:42 -05:00
parent 609c408638
commit f65114b7e3
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qt5-qttools.spec
View File

@ -5,7 +5,7 @@
Summary: Qt5 - QtTool components
Name: qt5-qttools
Version: 5.1.1
Release: 4%{?dist}
Release: 5%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -17,6 +17,10 @@ ExclusiveArch: %{ix86} x86_64 %{arm}
Patch1: qttools-system_clucene.patch
# help lrelease/lupdate use/prefer qmake-qt5
# https://bugzilla.redhat.com/show_bug.cgi?id=1009893
Patch2: qttools-opensource-src-5.1.1-qmake-qt5.patch
## upstream patches
# https://bugreports.qt-project.org/browse/QTBUG-32570
Patch100: CMake-Use-path-manipulation-features-from-qtbase.patch
@ -295,6 +299,9 @@ fi
%{_qt5_libdir}/pkgconfig/Qt5UiTools.pc
%changelog
* Sat Sep 21 2013 Rex Dieter <rdieter@fedoraproject.org> 5.1.1-5
- lupdate can't find qmake configuration file default (#1009893)
* Sat Sep 21 2013 Rex Dieter <rdieter@fedoraproject.org> 5.1.1-4
- use upstream cmake fix(es) (QTBUG-32570, #1006254)

27
qttools-opensource-src-5.1.1-qmake-qt5.patch Normal file
View File

@ -0,0 +1,27 @@
diff -up qttools-opensource-src-5.1.1/src/linguist/lrelease/main.cpp.qmake-qt5 qttools-opensource-src-5.1.1/src/linguist/lrelease/main.cpp
--- qttools-opensource-src-5.1.1/src/linguist/lrelease/main.cpp.qmake-qt5 2013-08-25 13:04:37.000000000 -0500
+++ qttools-opensource-src-5.1.1/src/linguist/lrelease/main.cpp 2013-09-21 01:01:44.970539849 -0500
@@ -311,9 +311,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();
QMakeParser parser(0, &evalHandler);
diff -up qttools-opensource-src-5.1.1/src/linguist/lupdate/main.cpp.qmake-qt5 qttools-opensource-src-5.1.1/src/linguist/lupdate/main.cpp
--- qttools-opensource-src-5.1.1/src/linguist/lupdate/main.cpp.qmake-qt5 2013-08-25 13:04:37.000000000 -0500
+++ qttools-opensource-src-5.1.1/src/linguist/lupdate/main.cpp 2013-09-21 01:00:41.474204348 -0500
@@ -824,7 +824,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.initProperties();
option.setCommandLineArguments(QDir::currentPath(),
QStringList() << QLatin1String("CONFIG+=lupdate_run"));