diff options
Diffstat (limited to 'qt5-use-win32-g++-mkspecs-profile.patch')
| -rw-r--r-- | qt5-use-win32-g++-mkspecs-profile.patch | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/qt5-use-win32-g++-mkspecs-profile.patch b/qt5-use-win32-g++-mkspecs-profile.patch index bba98c32613e..2b4ce16f3e1b 100644 --- a/qt5-use-win32-g++-mkspecs-profile.patch +++ b/qt5-use-win32-g++-mkspecs-profile.patch @@ -1,5 +1,5 @@ ---- mkspecs/win32-g++/qmake.conf.orig 2014-01-05 13:46:16.181559218 +0100 -+++ mkspecs/win32-g++/qmake.conf 2014-01-05 13:52:31.176768097 +0100 +--- qtbase-opensource-src-5.5.0/mkspecs/win32-g++/qmake.conf.orig 2015-06-29 22:05:10.000000000 +0200 ++++ qtbase-opensource-src-5.5.0/mkspecs/win32-g++/qmake.conf 2015-08-05 19:53:33.349194327 +0200 @@ -25,7 +25,7 @@ QMAKE_LEXFLAGS = QMAKE_YACC = byacc @@ -9,7 +9,7 @@ QMAKE_CFLAGS_DEPS = -M QMAKE_CFLAGS_WARN_ON = -Wall -Wextra QMAKE_CFLAGS_WARN_OFF = -w -@@ -66,10 +66,10 @@ +@@ -67,10 +67,10 @@ QMAKE_LINK = $${CROSS_COMPILE}g++ QMAKE_LINK_C = $${CROSS_COMPILE}gcc @@ -22,7 +22,7 @@ QMAKE_LFLAGS_DEBUG = QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows -@@ -81,14 +81,14 @@ +@@ -84,21 +84,25 @@ QMAKE_EXTENSION_STATICLIB = a QMAKE_LIBS = @@ -41,12 +41,6 @@ -QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain +QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqt5main - !isEmpty(QMAKE_SH) { - MINGW_IN_SHELL = 1 -@@ -102,12 +102,16 @@ - include(../common/shell-win32.conf) - } - -QMAKE_IDL = midl +QMAKE_IDL = $${CROSS_COMPILE}widl QMAKE_LIB = $${CROSS_COMPILE}ar -ru |