Fix use of static Qt with CMake
This commit is contained in:
parent
f1f9ca4519
commit
eb868854b2
|
@ -10,7 +10,7 @@
|
|||
_qt_module=qt3d
|
||||
pkgname="mingw-w64-qt5-3d"
|
||||
pkgver=5.12.0
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
arch=('i686' 'x86_64')
|
||||
pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"
|
||||
depends=('mingw-w64-qt5-declarative')
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
_qt_module=qtactiveqt
|
||||
pkgname=mingw-w64-qt5-activeqt
|
||||
pkgver=5.12.0
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
arch=('any')
|
||||
pkgdesc="ActiveX integration framework (mingw-w64)"
|
||||
depends=('mingw-w64-qt5-base')
|
||||
|
|
|
@ -163,5 +163,5 @@ index ed131c6823..b77d86cd6b 100644
|
|||
|
||||
QMAKE_LINK = $${CROSS_COMPILE}g++
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -23,5 +23,5 @@ index 00287b0665..35ad3007d1 100644
|
|||
#ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
|
||||
#include <stdio.h>
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -93,5 +93,5 @@ index 1c76a2e46f..6a5f046b34 100644
|
|||
SUBDIRS += src_3rdparty_libpng
|
||||
src_3rdparty_freetype.depends += src_3rdparty_libpng
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644
|
|||
HEADERS += opengl/qopengl.h \
|
||||
opengl/qopengl_p.h \
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -62,5 +62,5 @@ index e0d03ccc1c..37eee7fca3 100644
|
|||
uninst.append("\n\t");
|
||||
uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -24,5 +24,5 @@ index de7363e51b..b2b9d01799 100644
|
|||
if (project->isActiveConfig("dll")) {
|
||||
QString destDir = "";
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -29,5 +29,5 @@ index 5abf0624f4..a7f1285c26 100644
|
|||
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
|
||||
if(!subdir.isEmpty()) {
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -26,5 +26,5 @@ index 0332631ec8..dbb6f708b0 100644
|
|||
],
|
||||
"use": [
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -53,5 +53,5 @@ index 7cce0d71aa..4d3d774d45 100644
|
|||
# include <dbus/dbus.h>
|
||||
#else
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -25,5 +25,5 @@ index 17446b6c21..5b37371a7b 100644
|
|||
},
|
||||
"condition": "config.win32 && features.shared"
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -28,5 +28,5 @@ index dbb6f708b0..a7ffa0f113 100644
|
|||
},
|
||||
"fontconfig": {
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -25,5 +25,5 @@ index a7ffa0f113..796cd5aaa7 100644
|
|||
},
|
||||
"imf": {
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -24,5 +24,5 @@ index 908e7ff0d6..e5786a10cf 100644
|
|||
#include <pcre2.h>
|
||||
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -23,5 +23,5 @@ index 4802d3b04d..fac6be7301 100644
|
|||
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
|
||||
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -25,5 +25,5 @@ index fac6be7301..305aac405c 100644
|
|||
]
|
||||
},
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -66,5 +66,5 @@ index 4140ae48de..9ae73db74b 100644
|
|||
|
||||
CONFIG += static
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644
|
|||
-INSTALLS = lib
|
||||
+INSTALLS += lib
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644
|
|||
INSTALLS += target
|
||||
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -21,5 +21,5 @@ index 83e44ff9a4..6b1db38486 100644
|
|||
} else {
|
||||
CONFIG += no_core_dep
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -64,5 +64,5 @@ index 37eee7fca3..59b394ca51 100644
|
|||
+ project->first("QMAKE_EXTENSION_SHLIB"));
|
||||
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -128,5 +128,5 @@ index a7f1285c26..879410afef 100644
|
|||
|
||||
t << endl;
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -278,5 +278,5 @@ index 879410afef..2ff4c4f714 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 682d934b6365e11caca6a2ec45ce97f1888b2806 Mon Sep 17 00:00:00 2001
|
||||
From d5b5246f2422b82b55dd464964884ef31a7fa36c Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sat, 5 Aug 2017 21:14:26 +0200
|
||||
Subject: [PATCH 23/33] Allow usage of static version with CMake
|
||||
|
@ -12,13 +12,13 @@ installed in the same prefix
|
|||
via regular find_package(Qt5Core)
|
||||
---
|
||||
mkspecs/features/create_cmake.prf | 103 +++---
|
||||
.../data/cmake/Qt5BasicConfig.cmake.in | 298 ++++++++++++------
|
||||
.../data/cmake/Qt5BasicConfig.cmake.in | 302 ++++++++++++------
|
||||
.../data/cmake/Qt5PluginTarget.cmake.in | 18 +-
|
||||
.../cmake/Qt5StaticOnlyRedirection.cmake.in | 11 +
|
||||
src/corelib/Qt5CoreConfigExtras.cmake.in | 24 +-
|
||||
src/gui/Qt5GuiConfigExtras.cmake.in | 8 +-
|
||||
src/testlib/Qt5TestConfigExtras.cmake.in | 2 +-
|
||||
7 files changed, 313 insertions(+), 151 deletions(-)
|
||||
7 files changed, 315 insertions(+), 153 deletions(-)
|
||||
create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in
|
||||
|
||||
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
|
||||
|
@ -244,7 +244,7 @@ index 2a94964b49..839a51f377 100644
|
|||
# We are generating cmake files. Most developers of Qt are not aware of cmake,
|
||||
# so we require automatic tests to be available. The only module which should
|
||||
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
index 15d8b8372e..3492133d9b 100644
|
||||
index 15d8b8372e..939e55dfd8 100644
|
||||
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
@@ -3,6 +3,33 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
|
||||
|
@ -589,7 +589,7 @@ index 15d8b8372e..3492133d9b 100644
|
|||
macro(_process_prl_file PRL_FILE_LOCATION CONFIGURATION)
|
||||
if (EXISTS \"${PRL_FILE_LOCATION}\")
|
||||
file(STRINGS \"${PRL_FILE_LOCATION}\" prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE\")
|
||||
@@ -257,34 +343,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
@@ -257,37 +343,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
endmacro()
|
||||
|
||||
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
|
@ -643,8 +643,13 @@ index 15d8b8372e..3492133d9b 100644
|
|||
+ INTERFACE_COMPILE_DEFINITIONS $${MODULE_DEFINES})
|
||||
+!!ENDIF
|
||||
|
||||
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_ENABLED_FEATURES $$join(QT.$${MODULE}.enabled_features, ";"))
|
||||
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_DISABLED_FEATURES $$join(QT.$${MODULE}.disabled_features, ";"))
|
||||
- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_ENABLED_FEATURES $$join(QT.$${MODULE}.enabled_features, ";"))
|
||||
- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_DISABLED_FEATURES $$join(QT.$${MODULE}.disabled_features, ";"))
|
||||
+ set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_ENABLED_FEATURES $$join(QT.$${MODULE}.enabled_features, ";"))
|
||||
+ set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_DISABLED_FEATURES $$join(QT.$${MODULE}.disabled_features, ";"))
|
||||
|
||||
# Find plugin targets
|
||||
file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
|
||||
@@ -301,7 +398,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
endforeach()
|
||||
endif()
|
||||
|
@ -992,5 +997,5 @@ index 2a575958ae..ca0e3be3b5 100644
|
|||
INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
|
||||
)
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From c6e9aef076e72a4c7dab417d5b15afd28431877a Mon Sep 17 00:00:00 2001
|
||||
From 9c26fcc555b4ff9cca74dec82dae355bb2bc0044 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 2 Jun 2017 16:42:07 +0200
|
||||
Subject: [PATCH 24/33] Adjust linker flags for static build with
|
||||
|
@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644
|
|||
+unset(_isExe)
|
||||
+!!ENDIF
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 8f284db16131394f4532d3d3e19d6a12762b51c4 Mon Sep 17 00:00:00 2001
|
||||
From 5b7d7d07e4f92182bd3292dd63a043bb3fea9261 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:50:21 +0200
|
||||
Subject: [PATCH 25/33] Use correct pkg-config --static flag
|
||||
|
@ -22,5 +22,5 @@ index 2cc54d15a2..449fe4b9b8 100644
|
|||
$$qtConfEvaluate("features.cross_compile") {
|
||||
# cross compiling, check that pkg-config is set up sanely
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 21151358f35b2e052baf54a46f88f44f5797c260 Mon Sep 17 00:00:00 2001
|
||||
From 4f58af1580449536e00792fa5e4051352ba8133a Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 4 Dec 2016 20:35:47 +0100
|
||||
Subject: [PATCH 26/33] Fix macro invoking moc, rcc and uic
|
||||
|
@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644
|
|||
MAIN_DEPENDENCY ${infile} VERBATIM)
|
||||
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From c1e7b9eb36751d29aac541ac008f3a14e4d28931 Mon Sep 17 00:00:00 2001
|
||||
From a674be4a5788536a25bc76e6a94e161a76ed9e51 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 20:59:54 +0100
|
||||
Subject: [PATCH 27/33] Ignore errors about missing feature static
|
||||
|
@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644
|
|||
+ !equals($$1, "static"): error("Could not find feature $${1}.")
|
||||
}
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 7a20d588ccc27c9189882c83591bf6a57979a3fb Mon Sep 17 00:00:00 2001
|
||||
From 5872f3ae8556fa1dfd4be8155db37a86db715e20 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 21:08:20 +0100
|
||||
Subject: [PATCH 28/33] Enable and fix use of iconv
|
||||
|
@ -79,5 +79,5 @@ index 183eb3a13e..a4560d5a60 100644
|
|||
},
|
||||
"icu": {
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 437f342743230d9645840b7e4089f81bdb2cee6e Mon Sep 17 00:00:00 2001
|
||||
From 650000771fa6834dfb7faacddbabbc4dfb4830a9 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 21:08:48 +0100
|
||||
Subject: [PATCH 29/33] Ignore failing pkg-config test
|
||||
|
@ -21,5 +21,5 @@ index 5b37371a7b..ac98495157 100644
|
|||
"publicFeature",
|
||||
{ "type": "publicQtConfig", "negative": true },
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From f14f1928ace664034aeac5d348883a93f35b2ea5 Mon Sep 17 00:00:00 2001
|
||||
From 496054604431db3e647bf89d63a9140ce75d1001 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Tue, 7 Feb 2017 18:25:28 +0100
|
||||
Subject: [PATCH 30/33] Prevent qmake from messing static lib dependencies
|
||||
|
@ -39,5 +39,5 @@ index 59b394ca51..7788862142 100644
|
|||
static const char * const lflags[] = { "LIBS", "LIBS_PRIVATE",
|
||||
"QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr };
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From b8d30f6d8f98db183a28e60e684f33ed094b326c Mon Sep 17 00:00:00 2001
|
||||
From e8047d9652035fc4ed438dbe3d4583af05d0535e Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 23:42:30 +0100
|
||||
Subject: [PATCH 31/33] Hardcode linker flags for platform plugins
|
||||
|
@ -149,5 +149,5 @@ index 174bc7b609..e66488e364 100644
|
|||
include(windows.pri)
|
||||
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From e8da100dec44bc38ec5eb9675f231c5d14d2e62f Mon Sep 17 00:00:00 2001
|
||||
From dc6f09599400e4e6a790ba8bdd8fce3b6dc419de Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 25 Aug 2017 17:07:17 +0200
|
||||
Subject: [PATCH 32/33] Fix linking against static plugins with qmake
|
||||
|
@ -33,5 +33,5 @@ index 2c4d6cd97e..a15ab81899 100644
|
|||
# Check if the plugin is known to Qt. We can use this to determine
|
||||
# the plugin path. Unknown plugins must rely on the default link path.
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From c26a40fd24523774bba4f4edd58f68eede33c7b5 Mon Sep 17 00:00:00 2001
|
||||
From a06c30c0f497e4dcef912b2c316f2d97a6f0f933 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sat, 26 May 2018 03:47:14 +0200
|
||||
Subject: [PATCH 33/33] Disable hardware randomizer for 32-bit
|
||||
|
@ -45,5 +45,5 @@ index 917a91098e..c770a3e19b 100644
|
|||
#else
|
||||
return false;
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@ isNoOpenGL() {
|
|||
|
||||
pkgname=mingw-w64-qt5-base-angle
|
||||
pkgver=5.12.0
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='A cross-platform application and UI framework (mingw-w64)'
|
||||
# The static variant doesn't contain any executables which need to be executed on the build machine
|
||||
isStatic && arch=('any') || arch=('i686' 'x86_64')
|
||||
|
@ -86,39 +86,39 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
|
|||
'0032-Fix-linking-against-static-plugins-with-qmake.patch'
|
||||
'0033-Disable-hardware-randomizer-for-32-bit.patch')
|
||||
sha256sums=('5e03221d780e121aabd734896aab8f331e5d8c9d9b54f1eb04907d0818eaeecb'
|
||||
'98aeb35835e44f0311bf40969ead841163f8650c869cacf9c455ad87bf9e7d0a'
|
||||
'0290db9520f2c9255a01d3ee313ff8d1925f89c50d8b5fd4283882b62b299541'
|
||||
'02db1e6a3ac0ea7ad8aa15275920aeac50389dc0e7355a2280e36aa957234167'
|
||||
'a45fd65bd2c9f57361e1e68cab60132abf192b0508cc1d1559ee2abab2a91a86'
|
||||
'c2f21de21481189f610a95ad2efaf6d1845ef640ad8aa3ffb1c8a138a46ed50d'
|
||||
'df6975315f2f7a4a38d75baa6e4cf12d6e2759c8e16e57be81016cfe8a94de96'
|
||||
'01e478ff9fa20d38372bc6b4907264ad838b5de366737d907c5986459aff0209'
|
||||
'a52f036860850960e4af3adcc1e38cb708c28358e7de01decb20cc76b9d62d5d'
|
||||
'374e8e4f6afff9a0f49f02faadd361cf3df947452f9a0fa450c24baff920fc5d'
|
||||
'91b899ef0b2e4b716324ea1942fbd0d6c18c55ba21f37d65c253f893ec312990'
|
||||
'2bf1b91ebaca6647908a00f639477803f5c432b06a1e9550826ccad0f6d4deb9'
|
||||
'2aea9f55f77d93b041d102b82060c3625e59e4e6324ea83ffe0821ca5e082a1a'
|
||||
'db93259fe8fea464b22f5c8ca550edc0eebb6df0572574a1246cc4b9926251ee'
|
||||
'4304fa46b78615b912d8727a40fc39b836b2a4762442b29b7c8b2a8547ed4ea0'
|
||||
'b59bd5c1d0572466e76222cd5fda2a160dcde55a8bd65eacaecbe334ea567e16'
|
||||
'b339686494a3417a9263e93eb7623a544669861b57e4312d82d468062a9d3e6c'
|
||||
'c96c61d974e50b35cffe8391966c9641cca4f3ddef2bab4b016239169ab484c4'
|
||||
'295a965cfea15454e4f207afad47f02dac771f96a17a00867d3a7f0f0ee1ba20'
|
||||
'f165f53ffa069b677238c75a020466fa3e170edfbbb5ca3c312e2a014fec5607'
|
||||
'd45fed111601f21b6866b607925ae59c9842850f8d9531fc13808fc0de7f1e3a'
|
||||
'795700751790b164fb2062263e6681073acc3ef4d71ea50bb0a70510b9ff2018'
|
||||
'4b50d30b3b18aa6f397c2a7651aa58bca3fdf2234bed3a44c507939bc2edb00a'
|
||||
'3485baf0fd0a1402119ec6bd16ba23e53731ea75e6d881f88aa15933cedc19c3'
|
||||
'54c310eae3e5ca6bfbb2cb6d058fac81c523a2cf0123797d7a4d70b8272ab35f'
|
||||
'2f6175cacbf4982e624d8f0233803ae471b08e14d0fa971607517b4120e75493'
|
||||
'10d1712857531d277d314c95c0026b88df28f9b956dc5491e532858070e7f6da'
|
||||
'de214043a544b89d60101b67142d586cd4d2d61b9c84cf54d0652ce5b6d34f7e'
|
||||
'9cb1e05a00c0cf4486cc7bcc92a960f216694387b5098dad51584e9cfe882897'
|
||||
'9ff94ccfcf951c970e39ecde11b21c298ea839785ab27db9abd9379963b82c23'
|
||||
'6b0e3ed44996bf72230875767b3dde9bcabb1c2496badd95dc5ce8ea796ab5ba'
|
||||
'17fd194dfc5f630d4b98afcafb78d4c89d16d5cea40c3c4096e32956a1e87104'
|
||||
'c808a350cae7a7cc899ec3d496f5e3522a4dbefcd6adf41abcf46621be9468b7'
|
||||
'2aeefe22f926d37c467324bfa015cc33df9a05fa8aee318132fd566e9b66eb09')
|
||||
'5384b242223f2219c933c098397c287f387ef0b736633200c647c6feed69cc85'
|
||||
'01e71d5375ff6fb214e0b4f623f3c007485885d8e1fdfc185a1d25b6d1ea615a'
|
||||
'c2d68bcba25bd39f3d7f95271de99a28f0de33f98ae0a4f102728a48a58fa2b8'
|
||||
'cbeb19172eab4d2faef020560fb83190ac975fa54acaaf006a7b720e45b4fa43'
|
||||
'81f9e6a05b8c78392b0b8eb08535480cd9e0ebb6ed77ecffcf382f133482f55f'
|
||||
'fbcb5b586ec3a6723ac19378c40f1b28d12e8f0745db1016e38e040e6aad5e7b'
|
||||
'cffb2cc60dd4aed39dec14bef889e0e4a5fe8d1171297fdd0d31d65c58cb6591'
|
||||
'971f0176651edf8bafb1cd5062f04f1e840cc703ee85fabc1d04face637368b2'
|
||||
'6a2e839aa513a32a2f615fbd9a010a4e9db219fe5a35678b290d52ed4ebde9eb'
|
||||
'7696e92e2b5d9c6be69d0ffe520f3539ee8b25d019b460319e7e6c1a90805b8f'
|
||||
'4db1340b60add08de2eb9e365c2c9b45fbdbb9137a42c1631e6589527b66f197'
|
||||
'a3ceba043bd7eb078a850a0189afe8e0c431e39a5d88c8c4f1609917388b8606'
|
||||
'9471df45a4c536f83d51e2ec83bdfd3b1d6233b4fcaa992c48a1155cc31396cd'
|
||||
'e2401d6cb5ccdd51406d0ff9abb8a75f28abcf0eeb5fa77cc7f02f9122f200b9'
|
||||
'25be17392e2b73f7d8a8868d1d0671c52ab58c7d03011f3e4a9c186e9a6a2a9a'
|
||||
'84fb80ff48e6146d57530df475532a94002812e4b11a04e49ee1537ad0c91242'
|
||||
'0e3a3f2c2bbdf5c66d823a6a4c9afa88794d97901e97c927f0ee761a9bf11db6'
|
||||
'bcef0c63c33e609098dd834e0a07e684eb75776ffd2f7db20edbc433b780fed0'
|
||||
'6c23bc2a75720c3f66f23ecb1944d5c58ac39d6a87e1609b0d444d87a5b3df5d'
|
||||
'df7a6f64dd5973a5208fc82ab2604be5e468c0460e78659a63649a9fe4bda865'
|
||||
'e983f369f7bacb6ecacbe5964ddd09a07abe2e6ddb8b8be5abeb6f4a3b2510d6'
|
||||
'86b494b28602b0c5228e3ab14f5d22c66e2d9f19b77bc6027eb991cd99b8c1e0'
|
||||
'00ce0189c216b3baf3874d2ae2f9437c6e7ef117206cca1abcf6b1108c7b2ad9'
|
||||
'e04105e95ecf5220f87dbf4d4bc4a5a09fb00a77a107679a63c9cbb62c84afae'
|
||||
'03d97deef6266959afefc3cb4c39b9be15880b07a16bb6f5cf72c71c0ae2897f'
|
||||
'4c1ce0fa776f7a7f62239e4c4ffd0270e99f9bd7545c3bf32c3ceb5276bede93'
|
||||
'2bb0550e924d57da83ce586dab9b90180daee196d0f5303dce0af07a7e509e0b'
|
||||
'73bfcc40a301521a5c977e0ed427e40d780ee7d1416f4fbb3c67d4e6c101bcd3'
|
||||
'd252d96f69c41f3b3112304d53773ff7549cb95cbe0cde171a79e41ee55f89ab'
|
||||
'9bb54043cc8a3b18aca222cea873d1651e881132985ad49402d63a69df518baa'
|
||||
'e4ee1aabed10b1ea4192498b6e80998425ab581d7ad44a9d880066f7017d481e'
|
||||
'a6640e6680f323f846e63e28f4ef343cfbec75397f7a103119b7b3415bcee260'
|
||||
'7758fd6412d8007518099b351e6661b5157a59e253f328c94f42980e3f977260')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -163,5 +163,5 @@ index ed131c6823..b77d86cd6b 100644
|
|||
|
||||
QMAKE_LINK = $${CROSS_COMPILE}g++
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -23,5 +23,5 @@ index 00287b0665..35ad3007d1 100644
|
|||
#ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
|
||||
#include <stdio.h>
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -93,5 +93,5 @@ index 1c76a2e46f..6a5f046b34 100644
|
|||
SUBDIRS += src_3rdparty_libpng
|
||||
src_3rdparty_freetype.depends += src_3rdparty_libpng
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644
|
|||
HEADERS += opengl/qopengl.h \
|
||||
opengl/qopengl_p.h \
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -62,5 +62,5 @@ index e0d03ccc1c..37eee7fca3 100644
|
|||
uninst.append("\n\t");
|
||||
uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -24,5 +24,5 @@ index de7363e51b..b2b9d01799 100644
|
|||
if (project->isActiveConfig("dll")) {
|
||||
QString destDir = "";
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -29,5 +29,5 @@ index 5abf0624f4..a7f1285c26 100644
|
|||
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
|
||||
if(!subdir.isEmpty()) {
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -26,5 +26,5 @@ index 0332631ec8..dbb6f708b0 100644
|
|||
],
|
||||
"use": [
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -53,5 +53,5 @@ index 7cce0d71aa..4d3d774d45 100644
|
|||
# include <dbus/dbus.h>
|
||||
#else
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -25,5 +25,5 @@ index 17446b6c21..5b37371a7b 100644
|
|||
},
|
||||
"condition": "config.win32 && features.shared"
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -28,5 +28,5 @@ index dbb6f708b0..a7ffa0f113 100644
|
|||
},
|
||||
"fontconfig": {
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -25,5 +25,5 @@ index a7ffa0f113..796cd5aaa7 100644
|
|||
},
|
||||
"imf": {
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -24,5 +24,5 @@ index 908e7ff0d6..e5786a10cf 100644
|
|||
#include <pcre2.h>
|
||||
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -23,5 +23,5 @@ index 4802d3b04d..fac6be7301 100644
|
|||
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
|
||||
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -25,5 +25,5 @@ index fac6be7301..305aac405c 100644
|
|||
]
|
||||
},
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -66,5 +66,5 @@ index 4140ae48de..9ae73db74b 100644
|
|||
|
||||
CONFIG += static
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644
|
|||
-INSTALLS = lib
|
||||
+INSTALLS += lib
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644
|
|||
INSTALLS += target
|
||||
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -21,5 +21,5 @@ index 83e44ff9a4..6b1db38486 100644
|
|||
} else {
|
||||
CONFIG += no_core_dep
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -64,5 +64,5 @@ index 37eee7fca3..59b394ca51 100644
|
|||
+ project->first("QMAKE_EXTENSION_SHLIB"));
|
||||
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -128,5 +128,5 @@ index a7f1285c26..879410afef 100644
|
|||
|
||||
t << endl;
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -278,5 +278,5 @@ index 879410afef..2ff4c4f714 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 682d934b6365e11caca6a2ec45ce97f1888b2806 Mon Sep 17 00:00:00 2001
|
||||
From d5b5246f2422b82b55dd464964884ef31a7fa36c Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sat, 5 Aug 2017 21:14:26 +0200
|
||||
Subject: [PATCH 23/33] Allow usage of static version with CMake
|
||||
|
@ -12,13 +12,13 @@ installed in the same prefix
|
|||
via regular find_package(Qt5Core)
|
||||
---
|
||||
mkspecs/features/create_cmake.prf | 103 +++---
|
||||
.../data/cmake/Qt5BasicConfig.cmake.in | 298 ++++++++++++------
|
||||
.../data/cmake/Qt5BasicConfig.cmake.in | 302 ++++++++++++------
|
||||
.../data/cmake/Qt5PluginTarget.cmake.in | 18 +-
|
||||
.../cmake/Qt5StaticOnlyRedirection.cmake.in | 11 +
|
||||
src/corelib/Qt5CoreConfigExtras.cmake.in | 24 +-
|
||||
src/gui/Qt5GuiConfigExtras.cmake.in | 8 +-
|
||||
src/testlib/Qt5TestConfigExtras.cmake.in | 2 +-
|
||||
7 files changed, 313 insertions(+), 151 deletions(-)
|
||||
7 files changed, 315 insertions(+), 153 deletions(-)
|
||||
create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in
|
||||
|
||||
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
|
||||
|
@ -244,7 +244,7 @@ index 2a94964b49..839a51f377 100644
|
|||
# We are generating cmake files. Most developers of Qt are not aware of cmake,
|
||||
# so we require automatic tests to be available. The only module which should
|
||||
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
index 15d8b8372e..3492133d9b 100644
|
||||
index 15d8b8372e..939e55dfd8 100644
|
||||
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
@@ -3,6 +3,33 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
|
||||
|
@ -589,7 +589,7 @@ index 15d8b8372e..3492133d9b 100644
|
|||
macro(_process_prl_file PRL_FILE_LOCATION CONFIGURATION)
|
||||
if (EXISTS \"${PRL_FILE_LOCATION}\")
|
||||
file(STRINGS \"${PRL_FILE_LOCATION}\" prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE\")
|
||||
@@ -257,34 +343,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
@@ -257,37 +343,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
endmacro()
|
||||
|
||||
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
|
@ -643,8 +643,13 @@ index 15d8b8372e..3492133d9b 100644
|
|||
+ INTERFACE_COMPILE_DEFINITIONS $${MODULE_DEFINES})
|
||||
+!!ENDIF
|
||||
|
||||
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_ENABLED_FEATURES $$join(QT.$${MODULE}.enabled_features, ";"))
|
||||
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_DISABLED_FEATURES $$join(QT.$${MODULE}.disabled_features, ";"))
|
||||
- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_ENABLED_FEATURES $$join(QT.$${MODULE}.enabled_features, ";"))
|
||||
- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_DISABLED_FEATURES $$join(QT.$${MODULE}.disabled_features, ";"))
|
||||
+ set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_ENABLED_FEATURES $$join(QT.$${MODULE}.enabled_features, ";"))
|
||||
+ set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_DISABLED_FEATURES $$join(QT.$${MODULE}.disabled_features, ";"))
|
||||
|
||||
# Find plugin targets
|
||||
file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
|
||||
@@ -301,7 +398,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
endforeach()
|
||||
endif()
|
||||
|
@ -992,5 +997,5 @@ index 2a575958ae..ca0e3be3b5 100644
|
|||
INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
|
||||
)
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From c6e9aef076e72a4c7dab417d5b15afd28431877a Mon Sep 17 00:00:00 2001
|
||||
From 9c26fcc555b4ff9cca74dec82dae355bb2bc0044 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 2 Jun 2017 16:42:07 +0200
|
||||
Subject: [PATCH 24/33] Adjust linker flags for static build with
|
||||
|
@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644
|
|||
+unset(_isExe)
|
||||
+!!ENDIF
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 8f284db16131394f4532d3d3e19d6a12762b51c4 Mon Sep 17 00:00:00 2001
|
||||
From 5b7d7d07e4f92182bd3292dd63a043bb3fea9261 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:50:21 +0200
|
||||
Subject: [PATCH 25/33] Use correct pkg-config --static flag
|
||||
|
@ -22,5 +22,5 @@ index 2cc54d15a2..449fe4b9b8 100644
|
|||
$$qtConfEvaluate("features.cross_compile") {
|
||||
# cross compiling, check that pkg-config is set up sanely
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 21151358f35b2e052baf54a46f88f44f5797c260 Mon Sep 17 00:00:00 2001
|
||||
From 4f58af1580449536e00792fa5e4051352ba8133a Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 4 Dec 2016 20:35:47 +0100
|
||||
Subject: [PATCH 26/33] Fix macro invoking moc, rcc and uic
|
||||
|
@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644
|
|||
MAIN_DEPENDENCY ${infile} VERBATIM)
|
||||
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From c1e7b9eb36751d29aac541ac008f3a14e4d28931 Mon Sep 17 00:00:00 2001
|
||||
From a674be4a5788536a25bc76e6a94e161a76ed9e51 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 20:59:54 +0100
|
||||
Subject: [PATCH 27/33] Ignore errors about missing feature static
|
||||
|
@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644
|
|||
+ !equals($$1, "static"): error("Could not find feature $${1}.")
|
||||
}
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 7a20d588ccc27c9189882c83591bf6a57979a3fb Mon Sep 17 00:00:00 2001
|
||||
From 5872f3ae8556fa1dfd4be8155db37a86db715e20 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 21:08:20 +0100
|
||||
Subject: [PATCH 28/33] Enable and fix use of iconv
|
||||
|
@ -79,5 +79,5 @@ index 183eb3a13e..a4560d5a60 100644
|
|||
},
|
||||
"icu": {
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 437f342743230d9645840b7e4089f81bdb2cee6e Mon Sep 17 00:00:00 2001
|
||||
From 650000771fa6834dfb7faacddbabbc4dfb4830a9 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 21:08:48 +0100
|
||||
Subject: [PATCH 29/33] Ignore failing pkg-config test
|
||||
|
@ -21,5 +21,5 @@ index 5b37371a7b..ac98495157 100644
|
|||
"publicFeature",
|
||||
{ "type": "publicQtConfig", "negative": true },
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From f14f1928ace664034aeac5d348883a93f35b2ea5 Mon Sep 17 00:00:00 2001
|
||||
From 496054604431db3e647bf89d63a9140ce75d1001 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Tue, 7 Feb 2017 18:25:28 +0100
|
||||
Subject: [PATCH 30/33] Prevent qmake from messing static lib dependencies
|
||||
|
@ -39,5 +39,5 @@ index 59b394ca51..7788862142 100644
|
|||
static const char * const lflags[] = { "LIBS", "LIBS_PRIVATE",
|
||||
"QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr };
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From b8d30f6d8f98db183a28e60e684f33ed094b326c Mon Sep 17 00:00:00 2001
|
||||
From e8047d9652035fc4ed438dbe3d4583af05d0535e Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 23:42:30 +0100
|
||||
Subject: [PATCH 31/33] Hardcode linker flags for platform plugins
|
||||
|
@ -149,5 +149,5 @@ index 174bc7b609..e66488e364 100644
|
|||
include(windows.pri)
|
||||
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From e8da100dec44bc38ec5eb9675f231c5d14d2e62f Mon Sep 17 00:00:00 2001
|
||||
From dc6f09599400e4e6a790ba8bdd8fce3b6dc419de Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 25 Aug 2017 17:07:17 +0200
|
||||
Subject: [PATCH 32/33] Fix linking against static plugins with qmake
|
||||
|
@ -33,5 +33,5 @@ index 2c4d6cd97e..a15ab81899 100644
|
|||
# Check if the plugin is known to Qt. We can use this to determine
|
||||
# the plugin path. Unknown plugins must rely on the default link path.
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From c26a40fd24523774bba4f4edd58f68eede33c7b5 Mon Sep 17 00:00:00 2001
|
||||
From a06c30c0f497e4dcef912b2c316f2d97a6f0f933 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sat, 26 May 2018 03:47:14 +0200
|
||||
Subject: [PATCH 33/33] Disable hardware randomizer for 32-bit
|
||||
|
@ -45,5 +45,5 @@ index 917a91098e..c770a3e19b 100644
|
|||
#else
|
||||
return false;
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@ isNoOpenGL() {
|
|||
|
||||
pkgname=mingw-w64-qt5-base-dynamic
|
||||
pkgver=5.12.0
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='A cross-platform application and UI framework (mingw-w64)'
|
||||
# The static variant doesn't contain any executables which need to be executed on the build machine
|
||||
isStatic && arch=('any') || arch=('i686' 'x86_64')
|
||||
|
@ -86,39 +86,39 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
|
|||
'0032-Fix-linking-against-static-plugins-with-qmake.patch'
|
||||
'0033-Disable-hardware-randomizer-for-32-bit.patch')
|
||||
sha256sums=('5e03221d780e121aabd734896aab8f331e5d8c9d9b54f1eb04907d0818eaeecb'
|
||||
'98aeb35835e44f0311bf40969ead841163f8650c869cacf9c455ad87bf9e7d0a'
|
||||
'0290db9520f2c9255a01d3ee313ff8d1925f89c50d8b5fd4283882b62b299541'
|
||||
'02db1e6a3ac0ea7ad8aa15275920aeac50389dc0e7355a2280e36aa957234167'
|
||||
'a45fd65bd2c9f57361e1e68cab60132abf192b0508cc1d1559ee2abab2a91a86'
|
||||
'c2f21de21481189f610a95ad2efaf6d1845ef640ad8aa3ffb1c8a138a46ed50d'
|
||||
'df6975315f2f7a4a38d75baa6e4cf12d6e2759c8e16e57be81016cfe8a94de96'
|
||||
'01e478ff9fa20d38372bc6b4907264ad838b5de366737d907c5986459aff0209'
|
||||
'a52f036860850960e4af3adcc1e38cb708c28358e7de01decb20cc76b9d62d5d'
|
||||
'374e8e4f6afff9a0f49f02faadd361cf3df947452f9a0fa450c24baff920fc5d'
|
||||
'91b899ef0b2e4b716324ea1942fbd0d6c18c55ba21f37d65c253f893ec312990'
|
||||
'2bf1b91ebaca6647908a00f639477803f5c432b06a1e9550826ccad0f6d4deb9'
|
||||
'2aea9f55f77d93b041d102b82060c3625e59e4e6324ea83ffe0821ca5e082a1a'
|
||||
'db93259fe8fea464b22f5c8ca550edc0eebb6df0572574a1246cc4b9926251ee'
|
||||
'4304fa46b78615b912d8727a40fc39b836b2a4762442b29b7c8b2a8547ed4ea0'
|
||||
'b59bd5c1d0572466e76222cd5fda2a160dcde55a8bd65eacaecbe334ea567e16'
|
||||
'b339686494a3417a9263e93eb7623a544669861b57e4312d82d468062a9d3e6c'
|
||||
'c96c61d974e50b35cffe8391966c9641cca4f3ddef2bab4b016239169ab484c4'
|
||||
'295a965cfea15454e4f207afad47f02dac771f96a17a00867d3a7f0f0ee1ba20'
|
||||
'f165f53ffa069b677238c75a020466fa3e170edfbbb5ca3c312e2a014fec5607'
|
||||
'd45fed111601f21b6866b607925ae59c9842850f8d9531fc13808fc0de7f1e3a'
|
||||
'795700751790b164fb2062263e6681073acc3ef4d71ea50bb0a70510b9ff2018'
|
||||
'4b50d30b3b18aa6f397c2a7651aa58bca3fdf2234bed3a44c507939bc2edb00a'
|
||||
'3485baf0fd0a1402119ec6bd16ba23e53731ea75e6d881f88aa15933cedc19c3'
|
||||
'54c310eae3e5ca6bfbb2cb6d058fac81c523a2cf0123797d7a4d70b8272ab35f'
|
||||
'2f6175cacbf4982e624d8f0233803ae471b08e14d0fa971607517b4120e75493'
|
||||
'10d1712857531d277d314c95c0026b88df28f9b956dc5491e532858070e7f6da'
|
||||
'de214043a544b89d60101b67142d586cd4d2d61b9c84cf54d0652ce5b6d34f7e'
|
||||
'9cb1e05a00c0cf4486cc7bcc92a960f216694387b5098dad51584e9cfe882897'
|
||||
'9ff94ccfcf951c970e39ecde11b21c298ea839785ab27db9abd9379963b82c23'
|
||||
'6b0e3ed44996bf72230875767b3dde9bcabb1c2496badd95dc5ce8ea796ab5ba'
|
||||
'17fd194dfc5f630d4b98afcafb78d4c89d16d5cea40c3c4096e32956a1e87104'
|
||||
'c808a350cae7a7cc899ec3d496f5e3522a4dbefcd6adf41abcf46621be9468b7'
|
||||
'2aeefe22f926d37c467324bfa015cc33df9a05fa8aee318132fd566e9b66eb09')
|
||||
'5384b242223f2219c933c098397c287f387ef0b736633200c647c6feed69cc85'
|
||||
'01e71d5375ff6fb214e0b4f623f3c007485885d8e1fdfc185a1d25b6d1ea615a'
|
||||
'c2d68bcba25bd39f3d7f95271de99a28f0de33f98ae0a4f102728a48a58fa2b8'
|
||||
'cbeb19172eab4d2faef020560fb83190ac975fa54acaaf006a7b720e45b4fa43'
|
||||
'81f9e6a05b8c78392b0b8eb08535480cd9e0ebb6ed77ecffcf382f133482f55f'
|
||||
'fbcb5b586ec3a6723ac19378c40f1b28d12e8f0745db1016e38e040e6aad5e7b'
|
||||
'cffb2cc60dd4aed39dec14bef889e0e4a5fe8d1171297fdd0d31d65c58cb6591'
|
||||
'971f0176651edf8bafb1cd5062f04f1e840cc703ee85fabc1d04face637368b2'
|
||||
'6a2e839aa513a32a2f615fbd9a010a4e9db219fe5a35678b290d52ed4ebde9eb'
|
||||
'7696e92e2b5d9c6be69d0ffe520f3539ee8b25d019b460319e7e6c1a90805b8f'
|
||||
'4db1340b60add08de2eb9e365c2c9b45fbdbb9137a42c1631e6589527b66f197'
|
||||
'a3ceba043bd7eb078a850a0189afe8e0c431e39a5d88c8c4f1609917388b8606'
|
||||
'9471df45a4c536f83d51e2ec83bdfd3b1d6233b4fcaa992c48a1155cc31396cd'
|
||||
'e2401d6cb5ccdd51406d0ff9abb8a75f28abcf0eeb5fa77cc7f02f9122f200b9'
|
||||
'25be17392e2b73f7d8a8868d1d0671c52ab58c7d03011f3e4a9c186e9a6a2a9a'
|
||||
'84fb80ff48e6146d57530df475532a94002812e4b11a04e49ee1537ad0c91242'
|
||||
'0e3a3f2c2bbdf5c66d823a6a4c9afa88794d97901e97c927f0ee761a9bf11db6'
|
||||
'bcef0c63c33e609098dd834e0a07e684eb75776ffd2f7db20edbc433b780fed0'
|
||||
'6c23bc2a75720c3f66f23ecb1944d5c58ac39d6a87e1609b0d444d87a5b3df5d'
|
||||
'df7a6f64dd5973a5208fc82ab2604be5e468c0460e78659a63649a9fe4bda865'
|
||||
'e983f369f7bacb6ecacbe5964ddd09a07abe2e6ddb8b8be5abeb6f4a3b2510d6'
|
||||
'86b494b28602b0c5228e3ab14f5d22c66e2d9f19b77bc6027eb991cd99b8c1e0'
|
||||
'00ce0189c216b3baf3874d2ae2f9437c6e7ef117206cca1abcf6b1108c7b2ad9'
|
||||
'e04105e95ecf5220f87dbf4d4bc4a5a09fb00a77a107679a63c9cbb62c84afae'
|
||||
'03d97deef6266959afefc3cb4c39b9be15880b07a16bb6f5cf72c71c0ae2897f'
|
||||
'4c1ce0fa776f7a7f62239e4c4ffd0270e99f9bd7545c3bf32c3ceb5276bede93'
|
||||
'2bb0550e924d57da83ce586dab9b90180daee196d0f5303dce0af07a7e509e0b'
|
||||
'73bfcc40a301521a5c977e0ed427e40d780ee7d1416f4fbb3c67d4e6c101bcd3'
|
||||
'd252d96f69c41f3b3112304d53773ff7549cb95cbe0cde171a79e41ee55f89ab'
|
||||
'9bb54043cc8a3b18aca222cea873d1651e881132985ad49402d63a69df518baa'
|
||||
'e4ee1aabed10b1ea4192498b6e80998425ab581d7ad44a9d880066f7017d481e'
|
||||
'a6640e6680f323f846e63e28f4ef343cfbec75397f7a103119b7b3415bcee260'
|
||||
'7758fd6412d8007518099b351e6661b5157a59e253f328c94f42980e3f977260')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
@ -163,5 +163,5 @@ index ed131c6823..b77d86cd6b 100644
|
|||
|
||||
QMAKE_LINK = $${CROSS_COMPILE}g++
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -23,5 +23,5 @@ index 00287b0665..35ad3007d1 100644
|
|||
#ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
|
||||
#include <stdio.h>
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -93,5 +93,5 @@ index 1c76a2e46f..6a5f046b34 100644
|
|||
SUBDIRS += src_3rdparty_libpng
|
||||
src_3rdparty_freetype.depends += src_3rdparty_libpng
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644
|
|||
HEADERS += opengl/qopengl.h \
|
||||
opengl/qopengl_p.h \
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -62,5 +62,5 @@ index e0d03ccc1c..37eee7fca3 100644
|
|||
uninst.append("\n\t");
|
||||
uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -24,5 +24,5 @@ index de7363e51b..b2b9d01799 100644
|
|||
if (project->isActiveConfig("dll")) {
|
||||
QString destDir = "";
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -29,5 +29,5 @@ index 5abf0624f4..a7f1285c26 100644
|
|||
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
|
||||
if(!subdir.isEmpty()) {
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -26,5 +26,5 @@ index 0332631ec8..dbb6f708b0 100644
|
|||
],
|
||||
"use": [
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -53,5 +53,5 @@ index 7cce0d71aa..4d3d774d45 100644
|
|||
# include <dbus/dbus.h>
|
||||
#else
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -25,5 +25,5 @@ index 17446b6c21..5b37371a7b 100644
|
|||
},
|
||||
"condition": "config.win32 && features.shared"
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -28,5 +28,5 @@ index dbb6f708b0..a7ffa0f113 100644
|
|||
},
|
||||
"fontconfig": {
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -25,5 +25,5 @@ index a7ffa0f113..796cd5aaa7 100644
|
|||
},
|
||||
"imf": {
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -24,5 +24,5 @@ index 908e7ff0d6..e5786a10cf 100644
|
|||
#include <pcre2.h>
|
||||
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -23,5 +23,5 @@ index 4802d3b04d..fac6be7301 100644
|
|||
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
|
||||
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -25,5 +25,5 @@ index fac6be7301..305aac405c 100644
|
|||
]
|
||||
},
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -66,5 +66,5 @@ index 4140ae48de..9ae73db74b 100644
|
|||
|
||||
CONFIG += static
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644
|
|||
-INSTALLS = lib
|
||||
+INSTALLS += lib
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644
|
|||
INSTALLS += target
|
||||
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -21,5 +21,5 @@ index 83e44ff9a4..6b1db38486 100644
|
|||
} else {
|
||||
CONFIG += no_core_dep
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -64,5 +64,5 @@ index 37eee7fca3..59b394ca51 100644
|
|||
+ project->first("QMAKE_EXTENSION_SHLIB"));
|
||||
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -128,5 +128,5 @@ index a7f1285c26..879410afef 100644
|
|||
|
||||
t << endl;
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -278,5 +278,5 @@ index 879410afef..2ff4c4f714 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 682d934b6365e11caca6a2ec45ce97f1888b2806 Mon Sep 17 00:00:00 2001
|
||||
From d5b5246f2422b82b55dd464964884ef31a7fa36c Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sat, 5 Aug 2017 21:14:26 +0200
|
||||
Subject: [PATCH 23/33] Allow usage of static version with CMake
|
||||
|
@ -12,13 +12,13 @@ installed in the same prefix
|
|||
via regular find_package(Qt5Core)
|
||||
---
|
||||
mkspecs/features/create_cmake.prf | 103 +++---
|
||||
.../data/cmake/Qt5BasicConfig.cmake.in | 298 ++++++++++++------
|
||||
.../data/cmake/Qt5BasicConfig.cmake.in | 302 ++++++++++++------
|
||||
.../data/cmake/Qt5PluginTarget.cmake.in | 18 +-
|
||||
.../cmake/Qt5StaticOnlyRedirection.cmake.in | 11 +
|
||||
src/corelib/Qt5CoreConfigExtras.cmake.in | 24 +-
|
||||
src/gui/Qt5GuiConfigExtras.cmake.in | 8 +-
|
||||
src/testlib/Qt5TestConfigExtras.cmake.in | 2 +-
|
||||
7 files changed, 313 insertions(+), 151 deletions(-)
|
||||
7 files changed, 315 insertions(+), 153 deletions(-)
|
||||
create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in
|
||||
|
||||
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
|
||||
|
@ -244,7 +244,7 @@ index 2a94964b49..839a51f377 100644
|
|||
# We are generating cmake files. Most developers of Qt are not aware of cmake,
|
||||
# so we require automatic tests to be available. The only module which should
|
||||
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
index 15d8b8372e..3492133d9b 100644
|
||||
index 15d8b8372e..939e55dfd8 100644
|
||||
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
@@ -3,6 +3,33 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
|
||||
|
@ -589,7 +589,7 @@ index 15d8b8372e..3492133d9b 100644
|
|||
macro(_process_prl_file PRL_FILE_LOCATION CONFIGURATION)
|
||||
if (EXISTS \"${PRL_FILE_LOCATION}\")
|
||||
file(STRINGS \"${PRL_FILE_LOCATION}\" prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE\")
|
||||
@@ -257,34 +343,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
@@ -257,37 +343,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
endmacro()
|
||||
|
||||
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
|
@ -643,8 +643,13 @@ index 15d8b8372e..3492133d9b 100644
|
|||
+ INTERFACE_COMPILE_DEFINITIONS $${MODULE_DEFINES})
|
||||
+!!ENDIF
|
||||
|
||||
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_ENABLED_FEATURES $$join(QT.$${MODULE}.enabled_features, ";"))
|
||||
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_DISABLED_FEATURES $$join(QT.$${MODULE}.disabled_features, ";"))
|
||||
- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_ENABLED_FEATURES $$join(QT.$${MODULE}.enabled_features, ";"))
|
||||
- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_DISABLED_FEATURES $$join(QT.$${MODULE}.disabled_features, ";"))
|
||||
+ set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_ENABLED_FEATURES $$join(QT.$${MODULE}.enabled_features, ";"))
|
||||
+ set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_DISABLED_FEATURES $$join(QT.$${MODULE}.disabled_features, ";"))
|
||||
|
||||
# Find plugin targets
|
||||
file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
|
||||
@@ -301,7 +398,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
endforeach()
|
||||
endif()
|
||||
|
@ -992,5 +997,5 @@ index 2a575958ae..ca0e3be3b5 100644
|
|||
INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
|
||||
)
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From c6e9aef076e72a4c7dab417d5b15afd28431877a Mon Sep 17 00:00:00 2001
|
||||
From 9c26fcc555b4ff9cca74dec82dae355bb2bc0044 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 2 Jun 2017 16:42:07 +0200
|
||||
Subject: [PATCH 24/33] Adjust linker flags for static build with
|
||||
|
@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644
|
|||
+unset(_isExe)
|
||||
+!!ENDIF
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 8f284db16131394f4532d3d3e19d6a12762b51c4 Mon Sep 17 00:00:00 2001
|
||||
From 5b7d7d07e4f92182bd3292dd63a043bb3fea9261 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 18 Sep 2016 18:50:21 +0200
|
||||
Subject: [PATCH 25/33] Use correct pkg-config --static flag
|
||||
|
@ -22,5 +22,5 @@ index 2cc54d15a2..449fe4b9b8 100644
|
|||
$$qtConfEvaluate("features.cross_compile") {
|
||||
# cross compiling, check that pkg-config is set up sanely
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 21151358f35b2e052baf54a46f88f44f5797c260 Mon Sep 17 00:00:00 2001
|
||||
From 4f58af1580449536e00792fa5e4051352ba8133a Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 4 Dec 2016 20:35:47 +0100
|
||||
Subject: [PATCH 26/33] Fix macro invoking moc, rcc and uic
|
||||
|
@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644
|
|||
MAIN_DEPENDENCY ${infile} VERBATIM)
|
||||
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From c1e7b9eb36751d29aac541ac008f3a14e4d28931 Mon Sep 17 00:00:00 2001
|
||||
From a674be4a5788536a25bc76e6a94e161a76ed9e51 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 20:59:54 +0100
|
||||
Subject: [PATCH 27/33] Ignore errors about missing feature static
|
||||
|
@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644
|
|||
+ !equals($$1, "static"): error("Could not find feature $${1}.")
|
||||
}
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 7a20d588ccc27c9189882c83591bf6a57979a3fb Mon Sep 17 00:00:00 2001
|
||||
From 5872f3ae8556fa1dfd4be8155db37a86db715e20 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 21:08:20 +0100
|
||||
Subject: [PATCH 28/33] Enable and fix use of iconv
|
||||
|
@ -79,5 +79,5 @@ index 183eb3a13e..a4560d5a60 100644
|
|||
},
|
||||
"icu": {
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 437f342743230d9645840b7e4089f81bdb2cee6e Mon Sep 17 00:00:00 2001
|
||||
From 650000771fa6834dfb7faacddbabbc4dfb4830a9 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 25 Jan 2017 21:08:48 +0100
|
||||
Subject: [PATCH 29/33] Ignore failing pkg-config test
|
||||
|
@ -21,5 +21,5 @@ index 5b37371a7b..ac98495157 100644
|
|||
"publicFeature",
|
||||
{ "type": "publicQtConfig", "negative": true },
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From f14f1928ace664034aeac5d348883a93f35b2ea5 Mon Sep 17 00:00:00 2001
|
||||
From 496054604431db3e647bf89d63a9140ce75d1001 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Tue, 7 Feb 2017 18:25:28 +0100
|
||||
Subject: [PATCH 30/33] Prevent qmake from messing static lib dependencies
|
||||
|
@ -39,5 +39,5 @@ index 59b394ca51..7788862142 100644
|
|||
static const char * const lflags[] = { "LIBS", "LIBS_PRIVATE",
|
||||
"QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr };
|
||||
--
|
||||
2.19.2
|
||||
2.20.1
|
||||
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue