diff options
Diffstat (limited to '0015-Rename-qtmain-to-qt5main.patch')
| -rw-r--r-- | 0015-Rename-qtmain-to-qt5main.patch | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch index 8b5a5f92a1c3..e4ee2ef05423 100644 --- a/0015-Rename-qtmain-to-qt5main.patch +++ b/0015-Rename-qtmain-to-qt5main.patch @@ -1,9 +1,11 @@ -From dd827f5dae7363c5bab406e8cd2291b6d623b2b9 Mon Sep 17 00:00:00 2001 +From 27a910a4727d8d33ea9f2f70d572512365dde3e9 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 15/31] Rename qtmain to qt5main Prevents conflict with mingw-w64-qt4 package + +Change-Id: I1a1533bb37d5c87b3f8e9534f67aa76026c44aed --- mkspecs/common/g++-win32.conf | 2 +- mkspecs/features/create_cmake.prf | 4 ++-- @@ -25,16 +27,16 @@ index 17d2a5efec..2975d371e3 100644 QMAKE_IDL = $${CROSS_COMPILE}widl QMAKE_LIB = $${CROSS_COMPILE}ar -rc diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 346fbf2467..b8045753f0 100644 +index 4aa5dad467..fa8c142ec5 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -317,8 +317,8 @@ mac { - CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll +@@ -321,8 +321,8 @@ mac { + CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll + CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll - mingw { -- CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}d.a +- CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}$${debug_suffix}.a - CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a -+ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a ++ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a + CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a !isEmpty(CMAKE_STATIC_TYPE) { @@ -68,5 +70,5 @@ index 1f54c846ec..162e7a4b1b 100644 CONFIG += static -- -2.24.1 +2.25.0 |