mxe/src/qtbase-1-fixes.patch

288 lines
11 KiB
Diff
Raw Normal View History

This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
2018-02-15 08:34:10 +00:00
From 618f569eb0d00789917050c5d0bc7cb959599821 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Wed, 26 Aug 2015 12:45:43 +0100
Subject: [PATCH 1/7] cmake: Rearrange STATIC vs INTERFACE targets
Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED)
for header-only modules when building Qt5 statically.
Source: https://git.io/vzWJz
See also: https://github.com/mxe/mxe/issues/1185
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
2018-02-15 08:34:10 +00:00
index 55c74aad66..d7bcffeb9c 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
2017-11-22 21:23:29 +00:00
@@ -224,12 +224,12 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
endif()
!!ENDIF
+!!IF equals(TEMPLATE, aux)
+ add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED)
+!!ELSE
!!IF !isEmpty(CMAKE_STATIC_TYPE)
add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
2017-11-22 21:23:29 +00:00
-!!ELSE
-!!IF equals(TEMPLATE, aux)
- add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED)
2017-11-22 21:23:29 +00:00
!!ELSE
add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED)
!!ENDIF
2018-02-15 08:34:10 +00:00
--
2.17.0
2018-02-15 08:34:10 +00:00
From 68f406b40eb3708809c042dfaf41b5366b437308 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sat, 16 Jul 2016 20:31:07 +1000
Subject: [PATCH 2/7] Fix pkgconfig file and library naming
See: https://codereview.qt-project.org/#/c/165394/
https://bugreports.qt.io/browse/QTBUG-30898
Currently, *.pc files are generated with debug suffix `d` in `-release`
mode and without the suffix in `-debug` or `-debug-and-release`. This
can be worked around by `CONIFG-=debug_and_release`, however, a more
predictable and consistent naming approach would be preferable.
This change mimics the *.prl file and lib conventions:
-release: creates normal *.pc files and lib names
-release -force-debug-info: normal as above
-debug: creates *d.pc and *d lib names
-debug-and-release: creates both
-default: creates both (default link: debug)
and should be unsurprising to users of `pkg-config`. At very least,
it's deterministic and easily incorporated into build systems.
Task-number: 30898
Change-Id: If75336ec7d21a7ec0cb6d245fe87c64afcb5a644
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
2018-02-15 08:34:10 +00:00
index e6a0d97f1a..5aefea28e5 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
2017-12-16 08:44:26 +00:00
@@ -265,6 +265,10 @@ load(qt_installs)
load(qt_targets)
+# Set TARGET towards the end but before pkgconfig setup to keep naming
+# conventions consistent with *prl files
+TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX)
+
# this builds on top of qt_common
!internal_module:!lib_bundle:if(unix|mingw) {
CONFIG += create_pc
2017-12-16 08:44:26 +00:00
@@ -275,12 +279,12 @@ load(qt_targets)
QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw]
QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw]
2018-02-15 08:34:10 +00:00
QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE -I${includedir}/$$MODULE_INCNAME
- QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$QT_MAJOR_VERSION ")
- QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$QT_MAJOR_VERSION)
+ QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt$$QT_MAJOR_VERSION, "Qt$$QT_MAJOR_VERSION ")
+ QMAKE_PKGCONFIG_FILE = $$TARGET
for(i, MODULE_DEPENDS): \
2017-06-02 14:07:52 +01:00
- QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$section(QT.$${i}.VERSION, ., 0, 0))
+ QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$section(QT.$${i}.VERSION, ., 0, 0))$$qtPlatformTargetSuffix()
isEmpty(QMAKE_PKGCONFIG_DESCRIPTION): \
- QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module
+ QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt$$QT_MAJOR_VERSION, "Qt ") module
pclib_replace.match = $$lib_replace.match
!isEmpty(lib_replace.replace): \
pclib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR
2017-12-16 08:44:26 +00:00
@@ -314,5 +318,3 @@ win32 {
# On other platforms, Qt's own compilation goes needs to compile the Qt 5.0 API
DEFINES *= QT_DISABLE_DEPRECATED_BEFORE=0x050000
}
-
-TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX) # Do this towards the end
2018-02-15 08:34:10 +00:00
--
2.17.0
2018-02-15 08:34:10 +00:00
2016-12-15 13:48:16 +00:00
2018-02-15 08:34:10 +00:00
From d0ccaee377241a6b661ccb9a6d57ebc694b50f76 Mon Sep 17 00:00:00 2001
2017-01-29 13:07:45 +00:00
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 29 Jan 2017 13:02:16 +0100
Subject: [PATCH 3/7] reenable fontconfig for win32 (MXE-specific)
2017-01-29 13:07:45 +00:00
Change-Id: I05b036366bd402e43309742412bcf8ca91fe125f
diff --git a/src/gui/configure.json b/src/gui/configure.json
2018-02-15 08:34:10 +00:00
index dab66fafb4..b90ce6e4d9 100644
2017-01-29 13:07:45 +00:00
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
2018-02-15 08:34:10 +00:00
@@ -956,7 +956,7 @@
2017-01-29 13:07:45 +00:00
},
"fontconfig": {
"label": "Fontconfig",
- "condition": "!config.win32 && !config.darwin && features.system-freetype && libs.fontconfig",
+ "condition": "!config.darwin && features.system-freetype && libs.fontconfig",
"output": [ "privateFeature", "feature" ]
},
"gbm": {
diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp
2018-02-15 08:34:10 +00:00
index ca33689cd7..194523eee0 100644
2017-01-29 13:07:45 +00:00
--- a/src/plugins/platforms/minimal/qminimalintegration.cpp
+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp
2017-06-02 14:07:52 +01:00
@@ -130,7 +130,11 @@ QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const
{
if (!m_fontDatabase && (m_options & EnableFonts)) {
2017-01-29 13:07:45 +00:00
#if QT_CONFIG(fontconfig)
+#ifdef Q_OS_WIN
2017-06-02 14:07:52 +01:00
+ m_fontDatabase = new QFreeTypeFontDatabase;
2017-01-29 13:07:45 +00:00
+#else
2017-06-02 14:07:52 +01:00
m_fontDatabase = new QGenericUnixFontDatabase;
2017-01-29 13:07:45 +00:00
+#endif
2017-06-02 14:07:52 +01:00
#elif defined(Q_OS_WINRT)
m_fontDatabase = new QWinRTFontDatabase;
#elif defined(Q_OS_WIN)
2018-02-15 08:34:10 +00:00
--
2.17.0
2017-01-29 13:07:45 +00:00
2018-02-15 08:34:10 +00:00
From 35e8ce1f490f973045c77385f96acaa3736c8787 Mon Sep 17 00:00:00 2001
2016-12-15 13:48:16 +00:00
From: Mark Brand <mabrand@mabrand.nl>
2017-01-29 13:07:45 +00:00
Date: Sun, 29 Jan 2017 16:22:03 +0100
Subject: [PATCH 4/7] fix treatment of SYBASE_LIBS
2017-01-29 13:07:45 +00:00
Change-Id: I4c9914cf7ef9d91feb0718a57f2551c1eeed47e0
2017-07-29 14:05:33 +01:00
diff --git a/src/plugins/sqldrivers/configure.pri b/src/plugins/sqldrivers/configure.pri
2018-02-15 08:34:10 +00:00
index b69b51b679..d37423adbd 100644
2017-07-29 14:05:33 +01:00
--- a/src/plugins/sqldrivers/configure.pri
+++ b/src/plugins/sqldrivers/configure.pri
@@ -92,7 +92,7 @@ defineTest(qtConfLibrary_sybaseEnv) {
2017-01-29 13:07:45 +00:00
libs += "-L$${sybase}/lib"
libs += $$getenv(SYBASE_LIBS)
!isEmpty(libs) {
- $${1}.libs = "$$val_escape(libs)"
+ $${1}.libs = $$libs
export($${1}.libs)
}
return(true)
2018-02-15 08:34:10 +00:00
--
2.17.0
2018-02-15 08:34:10 +00:00
2017-06-10 23:29:30 +01:00
2018-02-15 08:34:10 +00:00
From 4474738cdb894d948b2e7b30c32bf05455d41001 Mon Sep 17 00:00:00 2001
2017-06-10 23:29:30 +01:00
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 11 Jun 2017 00:27:41 +0200
Subject: [PATCH 5/7] use pkg-config for harfbuzz
2017-06-10 23:29:30 +01:00
Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421
diff --git a/src/gui/configure.json b/src/gui/configure.json
2018-02-15 08:34:10 +00:00
index b90ce6e4d9..fc9a3470c1 100644
2017-06-10 23:29:30 +01:00
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
2018-02-15 08:34:10 +00:00
@@ -215,7 +215,8 @@
]
},
2017-06-10 23:29:30 +01:00
"sources": [
- "-lharfbuzz"
+ { "type": "pkgConfig", "args": "harfbuzz" },
+ "-lharfbuzz"
]
},
"imf": {
2018-02-15 08:34:10 +00:00
--
2.17.0
From 8427c411a789c537b41d113d1f8f9ea7eb9d009a Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 23 Nov 2017 11:28:47 +0200
Subject: [PATCH 6/7] disable qt_random_cpu for i686-w64-mingw32
Workaround for gcc internal error compiling for mingw32:
global/qrandom.cpp: In function 'qsizetype qt_random_cpu(void*, qsizetype)':
global/qrandom.cpp:123:1: internal compiler error: in
ix86_compute_frame_layout, at config/i386/i386.c:10145
}
^
global/qrandom.cpp:123:1: internal compiler error: Segmentation fault
i686-w64-mingw32.static-g++: internal compiler error: Segmentation fault
(program cc1plus)
Based on https://codereview.qt-project.org/#/c/212360/
Change-Id: Ia1c902e7b147bdda2b8d7904b40a3b968b8d0369
diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
index 72ba299280..90a0f378ff 100644
--- a/src/corelib/global/qrandom.cpp
+++ b/src/corelib/global/qrandom.cpp
@@ -92,7 +92,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando
QT_BEGIN_NAMESPACE
-#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND)
+#if defined(Q_PROCESSOR_X86) && !defined(Q_PROCESSOR_X86_32) && QT_COMPILER_SUPPORTS_HERE(RDRND)
static qsizetype qt_random_cpu(void *buffer, qsizetype count) Q_DECL_NOTHROW;
# ifdef Q_PROCESSOR_X86_64
--
2.17.0
From 757881f896daa935361ec220733fe6c85af0002a Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Tue, 8 May 2018 21:57:07 -0700
Subject: [PATCH 7/7] Fix build with GCC 8: memset/memcpy/memmove of
non-trivials
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
qarraydataops.h:73:17: error: void* memset(void*, int, size_t) clearing an object of non-trivial type
struct TCBPoint; use assignment or value-initialization instead [-Werror=class-memaccess]
Change-Id: I5d0ee9389a794d80983efffd152ce10eb557341f
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
diff --git a/src/corelib/tools/qarraydataops.h b/src/corelib/tools/qarraydataops.h
index b7c3bc1287..e7f9c8a2f4 100644
--- a/src/corelib/tools/qarraydataops.h
+++ b/src/corelib/tools/qarraydataops.h
@@ -65,7 +65,7 @@ struct QPodArrayOps
Q_ASSERT(newSize > uint(this->size));
Q_ASSERT(newSize <= this->alloc);
- ::memset(this->end(), 0, (newSize - this->size) * sizeof(T));
+ ::memset(static_cast<void *>(this->end()), 0, (newSize - this->size) * sizeof(T));
this->size = int(newSize);
}
@@ -120,8 +120,9 @@ struct QPodArrayOps
Q_ASSERT(e <= where || b > this->end()); // No overlap
Q_ASSERT(size_t(e - b) <= this->alloc - uint(this->size));
- ::memmove(where + (e - b), where, (static_cast<const T*>(this->end()) - where) * sizeof(T));
- ::memcpy(where, b, (e - b) * sizeof(T));
+ ::memmove(static_cast<void *>(where + (e - b)), static_cast<void *>(where),
+ (static_cast<const T*>(this->end()) - where) * sizeof(T));
+ ::memcpy(static_cast<void *>(where), static_cast<const void *>(b), (e - b) * sizeof(T));
this->size += (e - b);
}
@@ -132,7 +133,8 @@ struct QPodArrayOps
Q_ASSERT(b >= this->begin() && b < this->end());
Q_ASSERT(e > this->begin() && e < this->end());
- ::memmove(b, e, (static_cast<T *>(this->end()) - e) * sizeof(T));
+ ::memmove(static_cast<void *>(b), static_cast<void *>(e),
+ (static_cast<T *>(this->end()) - e) * sizeof(T));
this->size -= (e - b);
}
};
--
2.17.0