diff options
Diffstat (limited to '0015-Rename-qtmain-to-qt5main.patch')
| -rw-r--r-- | 0015-Rename-qtmain-to-qt5main.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch index 119cb61a9df6..4398ab7ddf9b 100644 --- a/0015-Rename-qtmain-to-qt5main.patch +++ b/0015-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From bf08fb6aa45fd8492ff17db5c5ea8f2a6b861ad8 Mon Sep 17 00:00:00 2001 +From 23032a6a5efa261c73b40adbc708cec7fe309b3d Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 15/26] Rename qtmain to qt5main @@ -11,7 +11,7 @@ Prevents conflict with mingw-w64-qt4 package 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 11fb52a..4adacf6 100644 +index 11fb52a0b1..4adacf6762 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -225,8 +225,8 @@ mac { @@ -26,7 +26,7 @@ index 11fb52a..4adacf6 100644 !isEmpty(CMAKE_STATIC_TYPE) { CMAKE_STATIC_WINDOWS_BUILD = "true" diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf -index 986067f..339ac15 100644 +index 986067fc8c..339ac15efe 100644 --- a/mkspecs/features/win32/windows.prf +++ b/mkspecs/features/win32/windows.prf @@ -5,7 +5,7 @@ contains(TEMPLATE, ".*app") { @@ -39,7 +39,7 @@ index 986067f..339ac15 100644 QMAKE_LIBS += -L$$QT.core.libs CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro -index b497765..d63a684 100644 +index b4977653ce..d63a684a18 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -2,7 +2,7 @@ @@ -52,5 +52,5 @@ index b497765..d63a684 100644 CONFIG += static -- -2.10.2 +2.11.0 |