111 lines
4.7 KiB
Diff
111 lines
4.7 KiB
Diff
From 029abc25e2a00675868ae89c4251564a4fa81fa5 Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Mon, 14 Sep 2020 20:49:14 +0200
|
|
Subject: [PATCH 2/3] Rename qtmain to qt6main to make Qt 6 co-installable with
|
|
previous versions
|
|
|
|
Change-Id: Ic750ae711673e3ff246fcff0c54ab71644a3041e
|
|
---
|
|
mkspecs/common/g++-win32.conf | 2 +-
|
|
mkspecs/common/msvc-desktop.conf | 2 +-
|
|
mkspecs/features/create_cmake.prf | 8 ++++----
|
|
mkspecs/features/win32/windows.prf | 4 ++--
|
|
src/winmain/CMakeLists.txt | 2 +-
|
|
src/winmain/winmain.pro | 2 +-
|
|
6 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
|
|
index 9f3ae47108..3623645155 100644
|
|
--- a/mkspecs/common/g++-win32.conf
|
|
+++ b/mkspecs/common/g++-win32.conf
|
|
@@ -64,7 +64,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 -lqt6main
|
|
|
|
QMAKE_IDL = midl
|
|
QMAKE_LIB = $${CROSS_COMPILE}ar -rc
|
|
diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf
|
|
index a5993287ed..92dd730c39 100644
|
|
--- a/mkspecs/common/msvc-desktop.conf
|
|
+++ b/mkspecs/common/msvc-desktop.conf
|
|
@@ -105,7 +105,7 @@ QMAKE_LIBS_OPENGL = glu32.lib opengl32.lib gdi32.lib user32.lib
|
|
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 = -lqt6main
|
|
|
|
QMAKE_IDL = midl
|
|
QMAKE_LIB = lib /NOLOGO
|
|
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
|
|
index 73ebe453d3..98f32e1f04 100644
|
|
--- a/mkspecs/features/create_cmake.prf
|
|
+++ b/mkspecs/features/create_cmake.prf
|
|
@@ -329,15 +329,15 @@ mac {
|
|
}
|
|
|
|
mingw {
|
|
- 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 = libqt6main$${QT_LIBINFIX}$${debug_suffix}.a
|
|
+ CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt6main$${QT_LIBINFIX}.a
|
|
|
|
isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a
|
|
CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB}
|
|
CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB}
|
|
} else {
|
|
- CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
|
|
- CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
|
|
+ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt6main$${QT_LIBINFIX}$${debug_suffix}.lib
|
|
+ CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt6main$${QT_LIBINFIX}.lib
|
|
|
|
CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib
|
|
CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib
|
|
diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf
|
|
index 272170d428..d5314247db 100644
|
|
--- a/mkspecs/features/win32/windows.prf
|
|
+++ b/mkspecs/features/win32/windows.prf
|
|
@@ -5,8 +5,8 @@ contains(TEMPLATE, ".*app") {
|
|
mingw:DEFINES += QT_NEEDS_QMAIN
|
|
|
|
qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) {
|
|
- isEqual(entryLib, -lqtmain) {
|
|
- lib = $$QT.core.libs/$${QMAKE_PREFIX_STATICLIB}qtmain$$QT_LIBINFIX$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
|
|
+ isEqual(entryLib, -lqt6main) {
|
|
+ lib = $$QT.core.libs/$${QMAKE_PREFIX_STATICLIB}qt6main$$QT_LIBINFIX$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
|
|
PRE_TARGETDEPS += $$lib
|
|
QMAKE_LIBS += $$lib
|
|
} else {
|
|
diff --git a/src/winmain/CMakeLists.txt b/src/winmain/CMakeLists.txt
|
|
index 1a74a1e3ae..e2482f16e0 100644
|
|
--- a/src/winmain/CMakeLists.txt
|
|
+++ b/src/winmain/CMakeLists.txt
|
|
@@ -20,7 +20,7 @@ if (MSVC)
|
|
string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
|
|
endif()
|
|
|
|
-set_property(TARGET WinMain PROPERTY OUTPUT_NAME qtmain)
|
|
+set_property(TARGET WinMain PROPERTY OUTPUT_NAME qt6main)
|
|
|
|
qt_internal_extend_target(WinMain CONDITION
|
|
SOURCES qtmain_win.cpp
|
|
diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro
|
|
index 19ce9ffa82..cbbeea7323 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 = qt6main
|
|
DESTDIR = $$QT.core.libs
|
|
|
|
CONFIG += static
|
|
--
|
|
2.28.0
|
|
|