Mercurial > mxe-octave
annotate src/qtbase-1-fixes.patch @ 5281:9057112edb8e
* installer-files/post-install.bat: create qt.conf (Bug #57679)
| author | John Donoghue |
|---|---|
| date | Wed, 29 Jan 2020 08:34:50 -0500 |
| parents | db6f82a0f476 |
| children | 4fb7aa43ba15 |
| rev | line source |
|---|---|
| 4310 | 1 This file is part of MXE. See LICENSE.md for licensing information. |
| 4222 | 2 |
|
5250
db6f82a0f476
Qt5: Update to 5.14.0
John Donoghue <john.donoghue@ieee.org>
parents:
5199
diff
changeset
|
3 From 7c5ba14d5b42334edb6a70239cf231f847f508ef Mon Sep 17 00:00:00 2001 |
| 4222 | 4 From: Ray Donnelly <mingw.android@gmail.com> |
| 5 Date: Wed, 26 Aug 2015 12:45:43 +0100 | |
|
5250
db6f82a0f476
Qt5: Update to 5.14.0
John Donoghue <john.donoghue@ieee.org>
parents:
5199
diff
changeset
|
6 Subject: [PATCH 1/2] cmake: Rearrange STATIC vs INTERFACE targets |
| 4222 | 7 |
| 8 Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED) | |
| 9 for header-only modules when building Qt5 statically. | |
| 10 | |
| 11 Source: https://git.io/vzWJz | |
| 12 See also: https://github.com/mxe/mxe/issues/1185 | |
| 13 | |
| 14 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | |
|
5250
db6f82a0f476
Qt5: Update to 5.14.0
John Donoghue <john.donoghue@ieee.org>
parents:
5199
diff
changeset
|
15 index 364c23e750..c90dd302cf 100644 |
| 4222 | 16 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in |
| 17 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | |
|
5250
db6f82a0f476
Qt5: Update to 5.14.0
John Donoghue <john.donoghue@ieee.org>
parents:
5199
diff
changeset
|
18 @@ -343,6 +343,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) |
| 4735 | 19 list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\") |
| 4222 | 20 !!ENDIF |
| 21 | |
| 22 +!!IF equals(TEMPLATE, aux) | |
| 23 + add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) | |
| 24 +!!ELSE | |
| 25 !!IF !isEmpty(CMAKE_STATIC_TYPE) | |
| 5099 | 26 if(NOT Qt5_EXCLUDE_STATIC_DEPENDENCIES) |
| 27 !!IF !isEmpty(CMAKE_DEBUG_TYPE) | |
|
5250
db6f82a0f476
Qt5: Update to 5.14.0
John Donoghue <john.donoghue@ieee.org>
parents:
5199
diff
changeset
|
28 @@ -380,9 +383,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) |
| 5099 | 29 |
| 4222 | 30 add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) |
| 31 set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") | |
| 4735 | 32 -!!ELSE |
| 4222 | 33 -!!IF equals(TEMPLATE, aux) |
| 34 - add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) | |
| 4735 | 35 !!ELSE |
| 4222 | 36 add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) |
| 37 !!ENDIF | |
| 38 -- | |
| 5099 | 39 2.20.1 |
| 4222 | 40 |
| 4735 | 41 diff -ur qtbase-everywhere-src-5.11.0.orig/mkspecs/common/gcc-base.conf qtbase-everywhere-src-5.11.0/mkspecs/common/gcc-base.conf |
| 4956 | 42 --- qtbase-everywhere-src-5.11.0.orig/mkspecs/common/gcc-base.conf 2018-06-12 07:47:54.488874295 -0400 |
| 43 +++ qtbase-everywhere-src-5.11.0/mkspecs/common/gcc-base.conf 2018-06-12 07:48:46.550096817 -0400 | |
| 4735 | 44 @@ -46,7 +46,7 @@ |
| 45 QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC | |
| 46 QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC | |
| 47 QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC | |
| 48 -QMAKE_CFLAGS_ISYSTEM = -isystem | |
| 49 +QMAKE_CFLAGS_ISYSTEM = -I | |
| 50 QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses | |
| 51 QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden | |
| 52 QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions | |
| 5099 | 53 diff -ur qtbase-everywhere-src-5.13.0.orig/src/plugins/platforms/minimal/qminimalintegration.cpp qtbase-everywhere-src-5.13.0/src/plugins/platforms/minimal/qminimalintegration.cpp |
| 5199 | 54 --- qtbase-everywhere-src-5.13.0.orig/src/plugins/platforms/minimal/qminimalintegration.cpp 2019-06-21 13:24:11.167038403 -0400 |
| 55 +++ qtbase-everywhere-src-5.13.0/src/plugins/platforms/minimal/qminimalintegration.cpp 2019-06-21 13:31:33.734199370 -0400 | |
| 5099 | 56 @@ -162,7 +162,11 @@ |
| 5199 | 57 |
| 5099 | 58 if (!m_fontDatabase) { |
| 59 #if QT_CONFIG(fontconfig) | |
| 60 +# ifdef Q_OS_WIN | |
| 61 + m_fontDatabase = new QFreeTypeFontDatabase; | |
| 62 +# else | |
| 63 m_fontDatabase = new QGenericUnixFontDatabase; | |
| 64 +# endif | |
| 65 #else | |
| 66 m_fontDatabase = QPlatformIntegration::fontDatabase(); | |
| 67 #endif |