* Mainly issues concerning static build and CMake * Qt WebKit doesn't build with latest ANGLE, though
57 lines
2.0 KiB
Diff
57 lines
2.0 KiB
Diff
From bf08fb6aa45fd8492ff17db5c5ea8f2a6b861ad8 Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sun, 18 Sep 2016 14:25:40 +0200
|
|
Subject: [PATCH 15/25] 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 11fb52a..4adacf6 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 986067f..339ac15 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 b497765..d63a684 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.10.2
|
|
|