Skip to content

Commit 473d63c

Browse files
RobertBColtonras0219-msft
RobertBColton
authored and
ras0219-msft
committed
Qt 5.11 and static build fixes (#4164)
* fix da qt5 * fix qt config duplication * [qt5-base] Use vcpkg_extract_source_archive_ex [sqlite3] Enable SQLITE_ENABLE_COLUMN_METADATA * [qt5-*] Update sub-portfiles * qt5-base WIP * [qt5] Fix Could not find qmlcachegen.exe * [qt5-activeqt] Fix SHA512 * [qt5-base] Fix static builds * [qt5-base] Bump control version * [qt5-base] Restore removal of qmake dependencies * [qt5-base] Partially revert #3280 * [qt5-base][vcpkg_build_qmake] Fix Qt5Bootstrap.lib issues
1 parent cba23fe commit 473d63c

File tree

56 files changed

+176
-190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+176
-190
lines changed

‎ports/qscintilla/CONTROL‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Source: qscintilla
2-
Version: 2.10-4
2+
Version: 2.10-5
33
Description: QScintilla is a port to Qt of the Scintilla editing component. Features syntax highlighting, code-completion and much more (Barebone build without python bindings (missing dependeny PyQt) and without QtDesigner plugin)
44
Build-Depends: qt5-base

‎ports/qt5-3d/CONTROL‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Source: qt5-3d
2-
Version: 5.9.2-0
2+
Version: 5.11.1
33
Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering
44
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative

‎ports/qt5-3d/portfile.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
22

33
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
44

5-
qt_modular_library(qt3d 1c7dbd4e557cdd183ec6e929aae5727ce2ffcb519517942b588594bb81a78cb3d732cde4dae58085a70ec2968a8c2443eae96536125c25938222ff7c89f4f9a2)
5+
qt_modular_library(qt3d d1a07586d6b64ff3b1e85c41c8b3b86f6327e9e63f5f45344a65a6136179f6a8361ca9da80944b244d8edc53d8b0e9f8b646d613f6b42faac6cb724f49573a8a)

‎ports/qt5-activeqt/CONTROL‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Source: qt5-activeqt
2-
Version: 5.9.2-0
2+
Version: 5.11.1
33
Description: Qt5 ActiveQt Module - ActiveX components
44
Build-Depends: qt5-modularscripts, qt5-base

‎ports/qt5-activeqt/portfile.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ include(vcpkg_common_functions)
22

33
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
44

5-
qt_modular_library(qtactiveqt c013e5cba0b11af88161d3cad21923c4b3bf04b0905e5b0c527c1984806d0eb39f31322ff464b139f5d36b5c9f4afefe70492fc1e1f0e964e6e0eaa3f6edaaf9)
5+
qt_modular_library(qtactiveqt a6fb4a3a53f5965e0913276a784f2fce81351a9c54cc190f15b431a497e04a4b823a8cec132713e382dc4e3ab2edef967e920c7aaa7392a72d7b12263c9f4876)
66

77
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-activeqt/platforminputcontexts)

‎ports/qt5-base/CONTROL‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Source: qt5-base
2-
Version: 5.9.2-7
2+
Version: 5.11.1-2
33
Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
44
Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl

‎ports/qt5-base/configure_qt.cmake‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ function(configure_qt)
3232
-debug
3333
-prefix ${CURRENT_INSTALLED_DIR}/debug
3434
-extprefix ${CURRENT_PACKAGES_DIR}/debug
35-
-hostbindir ${CURRENT_INSTALLED_DIR}/debug/tools/qt5
36-
-archdatadir ${CURRENT_INSTALLED_DIR}/share/qt5/debug
37-
-datadir ${CURRENT_INSTALLED_DIR}/share/qt5/debug
38-
-plugindir ${CURRENT_INSTALLED_DIR}/debug/plugins
39-
-qmldir ${CURRENT_INSTALLED_DIR}/debug/qml
35+
-hostbindir ${CURRENT_PACKAGES_DIR}/debug/tools/qt5
36+
-archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug
37+
-datadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug
38+
-plugindir ${CURRENT_PACKAGES_DIR}/debug/plugins
39+
-qmldir ${CURRENT_PACKAGES_DIR}/debug/qml
4040
-headerdir ${CURRENT_PACKAGES_DIR}/include
4141
-I ${CURRENT_INSTALLED_DIR}/include
4242
-L ${CURRENT_INSTALLED_DIR}/debug/lib
@@ -53,11 +53,11 @@ function(configure_qt)
5353
-release
5454
-prefix ${CURRENT_INSTALLED_DIR}
5555
-extprefix ${CURRENT_PACKAGES_DIR}
56-
-hostbindir ${CURRENT_INSTALLED_DIR}/tools/qt5
57-
-archdatadir ${CURRENT_INSTALLED_DIR}/share/qt5
58-
-datadir ${CURRENT_INSTALLED_DIR}/share/qt5
59-
-plugindir ${CURRENT_INSTALLED_DIR}/plugins
60-
-qmldir ${CURRENT_INSTALLED_DIR}/qml
56+
-hostbindir ${CURRENT_PACKAGES_DIR}/tools/qt5
57+
-archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5
58+
-datadir ${CURRENT_PACKAGES_DIR}/share/qt5
59+
-plugindir ${CURRENT_PACKAGES_DIR}/plugins
60+
-qmldir ${CURRENT_PACKAGES_DIR}/qml
6161
-I ${CURRENT_INSTALLED_DIR}/include
6262
-L ${CURRENT_INSTALLED_DIR}/lib
6363
-platform ${_csc_PLATFORM}

‎ports/qt5-base/fix-C3615.patch‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎ports/qt5-base/fix-msvc2017.patch‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
diff -Naur a/mkspecs/common/msvc-version.conf b/mkspecs/common/msvc-version.conf
2+
--- a/mkspecs/common/msvc-version.conf 2018-06-15 03:29:31.000000000 -0400
3+
+++ b/mkspecs/common/msvc-version.conf 2018-08-23 00:26:46.436806400 -0400
4+
@@ -112,4 +112,11 @@
5+
COMPAT_MKSPEC =
6+
}
7+
8+
+
9+
+# MSVC 2017 15.8+ fixed std::aligned_storage but compilation fails without
10+
+# this flag since the fix breaks binary compatibility.
11+
+greaterThan(QMAKE_MSC_VER, 1914) {
12+
+ DEFINES += _ENABLE_EXTENDED_ALIGNED_STORAGE
13+
+}
14+
+
15+
!isEmpty(COMPAT_MKSPEC):!$$COMPAT_MKSPEC: CONFIG += $$COMPAT_MKSPEC
16+
diff -Naur a/qmake/Makefile.win32 b/qmake/Makefile.win32
17+
--- a/qmake/Makefile.win32 2018-06-15 03:29:31.000000000 -0400
18+
+++ b/qmake/Makefile.win32 2018-08-23 00:27:45.764849600 -0400
19+
@@ -39,7 +39,7 @@
20+
-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS \
21+
-DQT_VERSION_STR=\"$(QT_VERSION)\" -DQT_VERSION_MAJOR=$(QT_MAJOR_VERSION) -DQT_VERSION_MINOR=$(QT_MINOR_VERSION) -DQT_VERSION_PATCH=$(QT_PATCH_VERSION) \
22+
-DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL \
23+
- -DQT_NO_FOREACH -DUNICODE
24+
+ -DQT_NO_FOREACH -DUNICODE -D_ENABLE_EXTENDED_ALIGNED_STORAGE
25+
CFLAGS = $(CFLAGS_PCH) $(CFLAGS_BARE) $(CFLAGS)
26+
27+
CXXFLAGS_BARE = $(CFLAGS_BARE)

‎ports/qt5-base/fix-system-pcre2-linux.patch‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
2-
index a5a1b66..5a48a05 100644
3-
--- a/src/corelib/configure.json
4-
+++ b/src/corelib/configure.json
5-
@@ -163,8 +163,10 @@
6-
"builds": {
7-
"debug": "-lpcre2-16d",
8-
"release": "-lpcre2-16"
9-
- }
10-
- }
11-
+ },
12-
+ "condition": "config.win32"
13-
+ },
14-
+ { "libs": "-lpcre2-16", "condition": "!config.win32" }
15-
]
16-
},
17-
"pps": {
1+
diff -Naur a/src/corelib/configure.json b/src/corelib/configure.json
2+
--- a/src/corelib/configure.json 2018-08-23 02:58:54.544949500 -0400
3+
+++ b/src/corelib/configure.json 2018-08-23 02:59:31.481175300 -0400
4+
@@ -181,8 +181,10 @@
5+
"builds": {
6+
"debug": "-lpcre2-16d",
7+
"release": "-lpcre2-16"
8+
- }
9+
- }
10+
+ },
11+
+ "condition": "config.win32"
12+
+ },
13+
+ { "libs": "-lpcre2-16", "condition": "!config.win32" }
14+
]
15+
},
16+
"pps": {

0 commit comments

Comments
 (0)