This file is part of MXE. See LICENSE.md for licensing information. From ec9a746b191356a8caddb3f97e94cf7e06464249 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 26 Aug 2015 12:45:43 +0100 Subject: [PATCH 1/5] 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 index 3ed6dd5889..cc5bc9dc16 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -214,12 +214,12 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\") !!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") -!!ELSE -!!IF equals(TEMPLATE, aux) - add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) !!ELSE add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) !!ENDIF -- 2.19.1 From 4d85083061050bfb7c34214aa162549ba00ce027 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 16 Jul 2016 20:31:07 +1000 Subject: [PATCH 2/5] 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 index 51b5bde67a..faba17aedd 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -263,6 +263,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:if(unix|mingw) { CONFIG += create_pc @@ -278,12 +282,12 @@ load(qt_targets) QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] 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): \ - 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 @@ -317,5 +321,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 -- 2.19.1 From cbba4b2b163b7c68e7148c5d16654c20b9ae965a Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 29 Jan 2017 13:02:16 +0100 Subject: [PATCH 3/5] reenable fontconfig for win32 (MXE-specific) Change-Id: I05b036366bd402e43309742412bcf8ca91fe125f diff --git a/src/gui/configure.json b/src/gui/configure.json index 44140bc7b6..2f172d4850 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -1211,7 +1211,7 @@ "fontconfig": { "label": "Fontconfig", "autoDetect": "!config.darwin", - "condition": "!config.win32 && features.system-freetype && libs.fontconfig", + "condition": "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 index 0c04608fca..a26e02fbf3 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp @@ -161,7 +161,11 @@ QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const if (!m_fontDatabase) { #if QT_CONFIG(fontconfig) - m_fontDatabase = new QGenericUnixFontDatabase; +#ifdef Q_OS_WIN + m_fontDatabase = new QFreeTypeFontDatabase; +#else + m_fontDatabase = new QGenericUnixFontDatabase; +#endif #else m_fontDatabase = QPlatformIntegration::fontDatabase(); #endif -- 2.19.1 From 2f3cffee96fd38c78696d1a2ef7ca028ad12df53 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 11 Jun 2017 00:27:41 +0200 Subject: [PATCH 4/5] use pkg-config for harfbuzz Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421 diff --git a/src/gui/configure.json b/src/gui/configure.json index 2f172d4850..f13afde258 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -303,7 +303,8 @@ }, "headers": "harfbuzz/hb.h", "sources": [ - "-lharfbuzz" + { "type": "pkgConfig", "args": "harfbuzz" }, + "-lharfbuzz" ] }, "imf": { -- 2.19.1 From 717921a8e3397e1b52d8cb6f95f029e07151427d Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 23 Nov 2017 11:28:47 +0200 Subject: [PATCH 5/5] 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 6195c324e7..94902bcfc2 100644 --- a/src/corelib/global/qrandom.cpp +++ b/src/corelib/global/qrandom.cpp @@ -90,7 +90,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.19.1