File 0001-rename-qtmain-to-qt5main-to-be-different-t... of Package mingw64-libqt5-qtbase

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-rename-qtmain-to-qt5main-to-be-different-to-Qt4.patch of Package mingw64-libqt5-qtbase (Revision 7945667b328a99d4e6238716a202e1df)

Currently displaying revision 7945667b328a99d4e6238716a202e1df , Show latest

From cb03b959bee61781f310ac73ac98aaba7900a671 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Wed, 19 Jul 2017 19:52:04 +0200
Subject: [PATCH] rename qtmain to qt5main to be different to Qt4

Change-Id: Icd54b5132174d6493b6643e1148dd292231b8cef
---
 mkspecs/common/msvc-desktop.conf         | 2 +-
 mkspecs/common/winrt_winphone/qmake.conf | 2 +-
 mkspecs/features/create_cmake.prf        | 8 ++++----
 mkspecs/features/win32/windows.prf       | 2 +-
 mkspecs/win32-g++/qmake.conf             | 2 +-
 src/winmain/winmain.pro                  | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf
index 5296050ad8..85d4db2636 100644
--- a/mkspecs/common/msvc-desktop.conf
+++ b/mkspecs/common/msvc-desktop.conf
@@ -96,7 +96,7 @@ QMAKE_LIBS_OPENGL_ES2   = gdi32.lib user32.lib
 QMAKE_LIBS_OPENGL_ES2_DEBUG = gdi32.lib user32.lib
 QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib ws2_32.lib
 
-QMAKE_LIBS_QT_ENTRY     = -lqtmain
+QMAKE_LIBS_QT_ENTRY     = -lqt5main
 
 QMAKE_IDL               = midl /NOLOGO
 QMAKE_LIB               = lib /NOLOGO
diff --git a/mkspecs/common/winrt_winphone/qmake.conf b/mkspecs/common/winrt_winphone/qmake.conf
index 8e0aba7371..ae62088325 100644
--- a/mkspecs/common/winrt_winphone/qmake.conf
+++ b/mkspecs/common/winrt_winphone/qmake.conf
@@ -80,7 +80,7 @@ QMAKE_LIBS_CORE        += ws2_32.lib
 QMAKE_LIBS_GUI          =
 QMAKE_LIBS_NETWORK     += ws2_32.lib
 
-QMAKE_LIBS_QT_ENTRY     = -lqtmain
+QMAKE_LIBS_QT_ENTRY     = -lqt5main
 
 QMAKE_IDL               = midl
 QMAKE_LIB               = lib /NOLOGO
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index 44d98c05cd..cd522d03e2 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}d.a
+        CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
 
         !isEmpty(CMAKE_STATIC_TYPE) {
             CMAKE_STATIC_WINDOWS_BUILD = "true"
@@ -240,8 +240,8 @@ mac {
             CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.dll.a
         }
     } else {
-        CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib
-        CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
+        CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}d.lib
+        CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib
 
         !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..6f28c87bab 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/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 42eadfc0e0..3297350532 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -67,7 +67,7 @@ QMAKE_LIBS_OPENGL       = -lglu32 -lopengl32 -lgdi32 -luser32
 QMAKE_LIBS_OPENGL_ES2   = -lgdi32 -luser32
 QMAKE_LIBS_OPENGL_ES2_DEBUG = -lgdi32 -luser32
 QMAKE_LIBS_COMPAT       = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
-QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain
+QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqt5main
 
 QMAKE_IDL               = midl
 QMAKE_LIB               = $${CROSS_COMPILE}ar -rc
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.3

Places

File 0001-rename-qtmain-to-qt5main-to-be-different-to-Qt4.patch of Package mingw64-libqt5-qtbase (Revision 7945667b328a99d4e6238716a202e1df)

Places