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

rebase qmake-qt5.patch

Browse Source
This commit is contained in:
Rex Dieter 2015-07-16 10:24:36 -05:00
parent 381b43aeb3
commit e644ad51dd
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qt5-qttools.spec
View File

@ -30,7 +30,7 @@ Patch1: qttools-opensource-src-5.3.2-system-clucene.patch
# help lrelease/lupdate use/prefer qmake-qt5 # help lrelease/lupdate use/prefer qmake-qt5
# https://bugzilla.redhat.com/show_bug.cgi?id=1009893 # https://bugzilla.redhat.com/show_bug.cgi?id=1009893
Patch2: qttools-opensource-src-5.2.0-qmake-qt5.patch Patch2: qttools-opensource-src-5.5.0-qmake-qt5.patch
## upstream patches ## upstream patches

16
qttools-opensource-src-5.2.0-qmake-qt5.patch → qttools-opensource-src-5.5.0-qmake-qt5.patch
View File

@ -1,7 +1,7 @@
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 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.2.0-rc1/src/linguist/lrelease/main.cpp.qmake-qt5 2013-11-26 19:01:52.000000000 -0600 --- 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.2.0-rc1/src/linguist/lrelease/main.cpp 2013-12-02 11:33:01.346611970 -0600 +++ qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp 2015-07-16 10:23:49.664773033 -0500
@@ -318,9 +318,9 @@ int main(int argc, char **argv) @@ -310,9 +310,9 @@ int main(int argc, char **argv)
option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE")); option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE"));
if (option.qmake_abslocation.isEmpty()) if (option.qmake_abslocation.isEmpty())
#ifdef QT_BOOTSTRAPPED #ifdef QT_BOOTSTRAPPED
@ -13,10 +13,10 @@ diff -up qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp.qmake-q
#endif #endif
option.initProperties(); option.initProperties();
QMakeVfs vfs; QMakeVfs vfs;
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 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.2.0-rc1/src/linguist/lupdate/main.cpp.qmake-qt5 2013-11-26 19:01:52.000000000 -0600 --- 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.2.0-rc1/src/linguist/lupdate/main.cpp 2013-12-02 11:33:01.347611960 -0600 +++ qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp 2015-07-16 10:23:49.665773055 -0500
@@ -1070,7 +1070,7 @@ int main(int argc, char **argv) @@ -1048,7 +1048,7 @@ int main(int argc, char **argv)
ProFileGlobals option; ProFileGlobals option;
option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE")); option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE"));
if (option.qmake_abslocation.isEmpty()) if (option.qmake_abslocation.isEmpty())