Skip to content

Commit e9d0d6f

Browse files
[qtbase] Fix path for finding syncqt in Manifest mode (microsoft#45230)
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
1 parent 36e7cec commit e9d0d6f

5 files changed

Lines changed: 25 additions & 8 deletions

File tree

ports/qtbase/portfile.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,8 +513,8 @@ file(WRITE "${hostinfofile}" "${_contents}")
513513

514514
if(NOT VCPKG_CROSSCOMPILING OR EXISTS "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsAdditionalTargetInfo.cmake")
515515
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsAdditionalTargetInfo.cmake"
516-
"PACKAGE_PREFIX_DIR}/bin/syncqt"
517-
"PACKAGE_PREFIX_DIR}/tools/Qt6/bin/syncqt"
516+
"CMAKE_CURRENT_LIST_DIR}/../../bin/syncqt"
517+
"CMAKE_CURRENT_LIST_DIR}/../../tools/Qt6/bin/syncqt"
518518
IGNORE_UNCHANGED)
519519
endif()
520520

ports/qtbase/vcpkg.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "qtbase",
33
"version": "6.8.3",
4+
"port-version": 1,
45
"description": "Qt Base (Core, Gui, Widgets, Network, ...)",
56
"homepage": "https://www.qt.io/",
67
"license": null,
@@ -193,7 +194,8 @@
193194
"name": "qtbase",
194195
"default-features": false,
195196
"features": [
196-
"network"
197+
"network",
198+
"thread"
197199
]
198200
}
199201
]

scripts/ci.feature.baseline.txt

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1844,7 +1844,20 @@ qtactiveqt:x64-uwp = cascade
18441844
qtapplicationmanager:arm64-osx = cascade
18451845
qtapplicationmanager:arm64-uwp = cascade
18461846
qtapplicationmanager:x64-uwp = cascade
1847-
qtbase[sql-mysql]:x86-windows = cascade
1847+
qtbase[cups]:x64-linux = skip
1848+
qtbase[dbus]:x64-windows-static = cascade
1849+
qtbase[dbus,doubleconversion,sql-mysql](android) = cascade
1850+
qtbase[fontconfig](!linux) = feature-fails # see https://github.com/microsoft/vcpkg/issues/31247
1851+
qtbase[glib] = feature-fails
1852+
qtbase[gtk]:x64-linux = feature-fails
1853+
qtbase[gtk3]:x64-linux = feature-fails
1854+
qtbase[sql-oci]:arm64-windows = cascade
1855+
qtbase[sql-oci]:arm64-windows-static-md = cascade
1856+
qtbase[sql-oci](!(arm & windows)) = feature-fails # see https://github.com/microsoft/vcpkg/issues/32052
1857+
qtbase[vulkan](osx)=skip # fatal error: 'MoltenVK/mvk_vulkan.h' file not found
1858+
qtbase[xcb,xcb-xlib,xkb,xkbcommon-x11,xlib,xrender](osx) = skip # no x11 on macOS
1859+
qtbase[xcb,xcb-xlib,xkb,xkbcommon-x11,xlib,xrender](windows) = skip # X11_SUPPORTED == LINUX OR HPUX OR FREEBSD OR NETBSD OR OPENBSD OR SOLARIS OR HURD in qt's build system
1860+
qtbase(android)=skip # qtbase requires ANDROID_SDK_ROOT to be set. Consider adding it to the triplet.
18481861
qtcharts:arm64-uwp = cascade
18491862
qtcharts:x64-uwp = cascade
18501863
qtcoap:arm64-uwp = cascade
@@ -2264,8 +2277,6 @@ poco[core,mariadb,mysql] = options # You can not install mariadb and mysql at th
22642277
qt3d[animation] = options # is a requirement, see https://github.com/microsoft/vcpkg/issues/31336
22652278
qt3d[extras] = options # is a requirement, see https://github.com/microsoft/vcpkg/issues/31336
22662279
qt5compat[iconv](!uwp) = feature-fails # requires qtbase without icu
2267-
qtbase[fontconfig] = feature-fails # see https://github.com/microsoft/vcpkg/issues/31247
2268-
qtbase[sql-oci](!(arm & windows)) = feature-fails # see https://github.com/microsoft/vcpkg/issues/32052
22692280
qtmultimedia[core,ffmpeg,gstreamer,qml,widgets](osx) = combination-fails # Error: Qt will by default autolink both plugin backends in static builds leading to symbol collisions and a build failure in dependent ports! As such in static builds only one backend is allowed by default.
22702281
qtopcua[uacpp](!uwp) = feature-fails # Unified Automation C++ SDK is not installed
22712282
realsense2:arm64-windows = fail # fw-update-device.h(1): warning C4828: The file contains a character starting at offset 0x4c3 that is illegal in the current source character set (codepage 65001). See https://github.com/microsoft/vcpkg/issues/35628
@@ -2298,7 +2309,6 @@ libhdfs3 = skip # never worked https://github.com/microsoft/vcpkg/pull/10021#iss
22982309
magnum[anyshaderconverter,shadertools,shaderconverter,vk-info] = skip # only available in head build
22992310
magnum-plugins[cgltfimporter,glslangshaderconverter,ktximageconverter,ktximporter,openexrimageconverter,openexrimporter,spirvtoolsshaderconverter,stbdxtimageconverter] = skip # only available in head build
23002311
openjpeg[tools] = skip # fails and is deprecated
2301-
qtbase[xcb,xcb-xlib,xkb,xkbcommon-x11,xlib,xrender](osx) = skip # no x11 on macOS
23022312
s2n = skip # builds too slow
23032313
sciter = skip # The sciter port is deprecated by upstream and conflicts with upstream's replacement.
23042314
shogun = skip # shogun is not compatible with c++17 because it uses dynamic exception specifications but the dependency abseil requires c++17

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7782,7 +7782,7 @@
77827782
},
77837783
"qtbase": {
77847784
"baseline": "6.8.3",
7785-
"port-version": 0
7785+
"port-version": 1
77867786
},
77877787
"qtcharts": {
77887788
"baseline": "6.8.3",

versions/q-/qtbase.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "8fadd1802001862cb8fba5b579469c2cb8bb8b30",
5+
"version": "6.8.3",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "2c2f2819b3529b00be4004badb6effa8f3db123b",
510
"version": "6.8.3",

0 commit comments

Comments
 (0)