summarylogtreecommitdiffstats
path: root/0015-Rename-qtmain-to-qt5main.patch
diff options
context:
space:
mode:
authorMartchus2017-06-08 21:33:56 +0200
committerMartchus2017-06-08 21:33:56 +0200
commit3df6482af8c916f5105111d1dcf6711e01a56c47 (patch)
tree55879cff03b12573e665e21cdd7c7d7e65df1c2d /0015-Rename-qtmain-to-qt5main.patch
parent288f048fafcb5879c7c038c7e507b6ea98732b93 (diff)
downloadaur-3df6482af8c916f5105111d1dcf6711e01a56c47.tar.gz
Update to 5.9.0
Diffstat (limited to '0015-Rename-qtmain-to-qt5main.patch')
-rw-r--r--0015-Rename-qtmain-to-qt5main.patch56
1 files changed, 0 insertions, 56 deletions
diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch
deleted file mode 100644
index 365bfef9cb3..00000000000
--- a/0015-Rename-qtmain-to-qt5main.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From e81d865a144c5c12ea1b93922a8c27f676aad531 Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Sun, 18 Sep 2016 14:25:40 +0200
-Subject: [PATCH 15/30] Rename qtmain to qt5main
-
-Prevents conflict with mingw-w64-qt4 package
----
- mkspecs/features/create_cmake.prf | 4 ++--
- mkspecs/features/win32/windows.prf | 2 +-
- src/winmain/winmain.pro | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 1099e14b17..ed9b82fba9 100644
---- a/mkspecs/features/create_cmake.prf
-+++ b/mkspecs/features/create_cmake.prf
-@@ -225,8 +225,8 @@ mac {
- CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
-
- mingw {
-- CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}d.a
-- CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a
-+ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
-+ CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
-
- !isEmpty(CMAKE_STATIC_TYPE) {
- CMAKE_STATIC_WINDOWS_BUILD = "true"
-diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf
-index ecb167bf18..7c9368c3b3 100644
---- a/mkspecs/features/win32/windows.prf
-+++ b/mkspecs/features/win32/windows.prf
-@@ -5,7 +5,7 @@ contains(TEMPLATE, ".*app") {
- mingw:DEFINES += QT_NEEDS_QMAIN
-
- qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) {
-- isEqual(entryLib, -lqtmain) {
-+ isEqual(entryLib, -lqt5main): {
- !contains(QMAKE_DEFAULT_LIBDIRS, $$QT.core.libs): \
- 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 4140ae48de..9ae73db74b 100644
---- a/src/winmain/winmain.pro
-+++ b/src/winmain/winmain.pro
-@@ -2,7 +2,7 @@
- !win32:error("$$_FILE_ is intended only for Windows!")
-
- TEMPLATE = lib
--TARGET = qtmain
-+TARGET = qt5main
- DESTDIR = $$QT.core.libs
-
- CONFIG += static
---
-2.12.1
-