Skip to content

[Qt] Update to 6.9.2 - #47735

Merged
Billy O'Neal (BillyONeal) merged 52 commits into
microsoft:masterfrom
Neumann-A:update_qt_6.9.2
Nov 24, 2025
Merged

[Qt] Update to 6.9.2#47735
Billy O'Neal (BillyONeal) merged 52 commits into
microsoft:masterfrom
Neumann-A:update_qt_6.9.2

Conversation

@Neumann-A

@Neumann-A Alexander Neumann (Neumann-A) commented Oct 9, 2025

Copy link
Copy Markdown
Contributor

blocked by #47762
blocked by #47764
blocked by microsoft/vcpkg-tool#1817
closes #47688

@xavier2k6

Copy link
Copy Markdown
Contributor

Qt 6.9.3


Qt 6.10.0

@xavier2k6

Copy link
Copy Markdown
Contributor

Supersedes #47416.

@Neumann-A

Copy link
Copy Markdown
Contributor Author

Dlib messing up the link line in paraview.

/mnt/vcpkg-ci/installed/x64-linux/share/dlib/dlib.cmake(61):

set_target_properties(dlib::dlib
PROPERTIES
INTERFACE_COMPILE_FEATURES
cxx_std_14
INTERFACE_COMPILE_OPTIONS
$<$<COMPILE_LANGUAGE:CXX>:-Wreturn-type>
INTERFACE_INCLUDE_DIRECTORIES
/mnt/vcpkg-ci/installed/x64-linux/include
INTERFACE_LINK_LIBRARIES
$<$<NOT:$<CONFIG:DEBUG>>:/mnt/vcpkg-ci/installed/x64-linux/lib/libopenblas.a>
$<$<CONFIG:DEBUG>:/mnt/vcpkg-ci/installed/x64-linux/debug/lib/libopenblas.a>
$<$<NOT:$<CONFIG:DEBUG>>:/mnt/vcpkg-ci/installed/x64-linux/lib/liblapack.a>
$<$<CONFIG:DEBUG>:/mnt/vcpkg-ci/installed/x64-linux/debug/lib/liblapack.a>
$<$<NOT:$<CONFIG:DEBUG>>:/mnt/vcpkg-ci/installed/x64-linux/lib/libpng16.a>
$<$<CONFIG:DEBUG>:/mnt/vcpkg-ci/installed/x64-linux/debug/lib/libpng16d.a>
$<$<NOT:$<CONFIG:DEBUG>>:/mnt/vcpkg-ci/installed/x64-linux/lib/libz.a>
$<$<CONFIG:DEBUG>:/mnt/vcpkg-ci/installed/x64-linux/debug/lib/libz.a>
$<LINK_ONLY:m>
$<$<NOT:$<CONFIG:DEBUG>>:/mnt/vcpkg-ci/installed/x64-linux/lib/libjpeg.a>
$<$<CONFIG:DEBUG>:/mnt/vcpkg-ci/installed/x64-linux/debug/lib/libjpeg.a>
)

@Neumann-A

Copy link
Copy Markdown
Contributor Author

Billy O'Neal (@BillyONeal): I cannot solve the android failure since they are an error how the Docker containers are setup. If the android triplets are expected to use the output of the Linux triplet the docker container for android needs to be derived from the Linux container since that is the only way tools build by the linux triplet will run correctly with all possible system dependencies being available. I don't want to C&P this stuff since it does not seem to be the correct solution for it.

@dg0yt

Kai Pastor (dg0yt) commented Oct 12, 2025

Copy link
Copy Markdown
Contributor

Hitting the same android issue in #47710. Billy O'Neal (@BillyONeal) Reminder, microsoft/vcpkg-tool#177 would help decouple host dependencies from default features.

@Neumann-A

Copy link
Copy Markdown
Contributor Author

Billy O'Neal (@BillyONeal) Reminder, microsoft/vcpkg-tool#177 would help decouple host dependencies from default features.

this would decouple it a bit but it is not the ultimate solution. If you build host stuff in Container A you cannot cross-compile in "unrelated" Container B. Container B should be based on Container A and extend it. Only then it is certain that all system dependencies for the host are available.

@Neumann-A

Alexander Neumann (Neumann-A) commented Oct 12, 2025

Copy link
Copy Markdown
Contributor Author

Should i start to mark x86-windows as unsupported by Qt:
D:/b/qtmultimedia/src/here-src-6-8e83337bc7.clean/src/multimedia/windows/qwmf_support_p.h(63): error C2398: Element '2': conversion from 'DWORD' to 'qsizetype' requires a narrowing conversion

Ok upstream already has a fix for it

Billy O'Neal (BillyONeal) added a commit to BillyONeal/vcpkg-tool that referenced this pull request Oct 21, 2025
…icrosoft/vcpkg#47735

OK, so here's the situation:

`ci.baseline.txt` has:

```console
# Missing system libraries
qtwayland:arm64-osx=skip
qtwayland:x64-osx=skip
```

In microsoft/vcpkg#47735, `qtwayland` depends on `qtbase[wayland]`, which implicates the same missing system libraries. This causes `qtbase` to contain the feature `wayland` when we try to build it, even though `qtwayland` is skipped.
@BillyONeal Billy O'Neal (BillyONeal) added the requires:tool-release An issue that has been fixed in the microsoft/vcpkg-tool repo and is waiting for a release thereof label Oct 28, 2025
@kobalicek

Copy link
Copy Markdown
Contributor

I think this is a critical update.

The current version 6.9.1 fails when Qt is consumed with a linker error on latest macos:

ld: framework 'AGL' not found

@Neumann-A

Copy link
Copy Markdown
Contributor Author

This is blocked until either:

microsoft/vcpkg-tool#1822
or
microsoft/vcpkg-tool#1821
is merged and a new tool update has happened. Otherwise CI will just be red.

@kwsp

Copy link
Copy Markdown

Alexander Neumann (@Neumann-A) microsoft/vcpkg-tool#1822 has been merged. Could this PR move forward?

@Neumann-A

Copy link
Copy Markdown
Contributor Author

No since there has not been a tool update here.

@BillyONeal Billy O'Neal (BillyONeal) removed the requires:tool-release An issue that has been fixed in the microsoft/vcpkg-tool repo and is waiting for a release thereof label Nov 21, 2025
@BillyONeal

Copy link
Copy Markdown
Member

I don't know why close and reopen didn't force a re-merge this time :/

@Neumann-A

Copy link
Copy Markdown
Contributor Author

Hmm current errors look like baseline to me.

@BillyONeal

Copy link
Copy Markdown
Member

Yes, in fact it looks like this fixes many baseline issues from the macOS update we accidentally jumped the gun in landing.

# Conflicts:
#	ports/qtbase/vcpkg.json
#	versions/baseline.json
#	versions/q-/qtbase.json
# Conflicts:
#	scripts/ci.feature.baseline.txt
@BillyONeal
Billy O'Neal (BillyONeal) merged commit 1d611ef into microsoft:master Nov 24, 2025
13 of 17 checks passed
Ian Reinhart Geiser (geiseri) pushed a commit to geiseri/vcpkg that referenced this pull request Dec 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[qtshadertools] update to 6.9.2

8 participants