Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
243 commits
Select commit Hold shift + click to select a range
cdb49e4
wip commit
Neumann-A Oct 23, 2020
e9372b5
refactor openssl ports.
Neumann-A Oct 30, 2020
6d82654
fix issues due to the file movement
Neumann-A Oct 30, 2020
49e7194
Merge remote-tracking branch 'origin/refactor_openssl_ports' into qt6…
Neumann-A Oct 30, 2020
e0f4bc0
qt build succesful.
Neumann-A Oct 30, 2020
1554a43
qtbase finished?
Neumann-A Oct 31, 2020
66aa883
add qttools and qtdeclarative
Neumann-A Oct 31, 2020
6ee73e1
add EntryPoints to fixup_cmake_targets
Neumann-A Oct 31, 2020
b09130b
add todo
Neumann-A Oct 31, 2020
c85b373
more config fixup
Neumann-A Oct 31, 2020
6365d87
correct entrypoint and remove winmain
Neumann-A Oct 31, 2020
33f6bb5
format manifest
Neumann-A Oct 31, 2020
ab35e53
fix module issues
Neumann-A Oct 31, 2020
ede3490
add extra vars
Neumann-A Oct 31, 2020
c85a76d
make qtdeclarative work (x64-windows). -static has problems
Neumann-A Nov 1, 2020
1617545
some extra cleanup tools start building
Neumann-A Nov 1, 2020
31567e0
refactor code to use common script across ports
Neumann-A Nov 1, 2020
444b706
remove patch applied twice
Neumann-A Nov 1, 2020
2419181
remove copy pasta
Neumann-A Nov 1, 2020
e69c72e
add remaining qt6 ports
Neumann-A Nov 1, 2020
42b52ef
fix a few details
Neumann-A Nov 1, 2020
f92965c
fix the rest
Neumann-A Nov 1, 2020
f9ae130
format manifests
Neumann-A Nov 1, 2020
4f24ca1
add features to qt5compat.
Neumann-A Nov 1, 2020
63243b3
small modification to directories
Neumann-A Nov 1, 2020
8c0db50
copy plugins
Neumann-A Nov 1, 2020
b96c25e
a bit of cleanup
Neumann-A Nov 1, 2020
50cf8ff
smaller fixes
Neumann-A Nov 1, 2020
ebdde95
format manifest
Neumann-A Nov 1, 2020
bb266ad
fix_linux_configure_issue
Neumann-A Nov 2, 2020
af1f627
adding linux features.
Neumann-A Nov 2, 2020
0d447c2
dont use quotes around INSTALL_ vars to fix linux build
Neumann-A Nov 2, 2020
05344e8
fix script install on linux
Neumann-A Nov 2, 2020
87e784f
remove bin if empty on all platforms otherwise let vcpkg throw an error
Neumann-A Nov 2, 2020
e5746f0
fix syncqt path
Neumann-A Nov 2, 2020
f9c4c23
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Nov 2, 2020
a8bd8e9
fix assimp feature
Neumann-A Nov 2, 2020
6b335f8
try to figure you ci failures
Neumann-A Nov 2, 2020
d9ffefc
fix manifest format
Neumann-A Nov 2, 2020
d23a50d
change the head ref to dev
Neumann-A Nov 3, 2020
19dca0b
fix typo
Neumann-A Nov 3, 2020
ad2ed3c
switch to use FEATURE_ instead of QT_FEATURE
Neumann-A Nov 3, 2020
65a60b0
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Nov 4, 2020
beee635
[ZSTD] Update to 1.4.5
Neumann-A Nov 4, 2020
d4cbaea
[zstd] fix wrong assert to fix uwp regressions
Neumann-A Nov 5, 2020
44ddaf5
always install *.pc file. Correct -l flag in pc file
Neumann-A Nov 5, 2020
fa71ff0
Merge remote-tracking branch 'upstream/master' into update_zstd
Neumann-A Nov 6, 2020
5f652aa
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Nov 6, 2020
aa74bfb
remove any changes to vcpkg_copy_tools
Neumann-A Nov 6, 2020
43e4d76
fix orc regression
Neumann-A Nov 6, 2020
c58cece
fix arrow regressions
Neumann-A Nov 6, 2020
91bf296
fix zstd target suffix
Neumann-A Nov 6, 2020
3decef2
fix orc zstd linkage
Neumann-A Nov 6, 2020
f531536
fix find_package(ZSTD)
Neumann-A Nov 6, 2020
20620e9
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Nov 8, 2020
31c17eb
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Nov 11, 2020
c09d2ee
fix icu linkage in harfbuzz
Neumann-A Nov 11, 2020
6ccaf5e
Merge remote-tracking branch 'origin/update_zstd' into qt6-base
Neumann-A Nov 12, 2020
4e58e58
install zstd dlls.
Neumann-A Nov 12, 2020
356b3cd
Merge branch 'update_zstd' into qt6-base
Neumann-A Nov 12, 2020
8c077d9
skip qt5-base in ci to test qtbase due to conflicts
Neumann-A Nov 12, 2020
3d89f2b
fix the patch due to a replacement error
Neumann-A Nov 12, 2020
09e71f3
Merge branch 'update_zstd' into qt6-base
Neumann-A Nov 12, 2020
d8cbac5
add a way for vcpkg_from_github to only download the source archive a…
Neumann-A Nov 12, 2020
72e8d12
update everything to beta4.
Neumann-A Nov 12, 2020
7abe989
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Nov 12, 2020
358ddef
remove outdated patches
Neumann-A Nov 13, 2020
62548a0
Print the failed condition
Neumann-A Nov 13, 2020
9d63086
more debug messages
Neumann-A Nov 13, 2020
9afff03
fix condition patch
Neumann-A Nov 13, 2020
b8548d1
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Nov 19, 2020
00e11c3
update to beta5
Neumann-A Nov 19, 2020
02ad1c6
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Dec 8, 2020
b330d05
update vcpkg_from_git to support tags and make output of ref possible.
Neumann-A Dec 8, 2020
fee135e
update ports
Neumann-A Dec 8, 2020
8dde32b
add missing qt ports, fix qtbase build
Neumann-A Dec 8, 2020
3930347
regenerate docs
Neumann-A Dec 9, 2020
197d254
fix typo
Neumann-A Dec 9, 2020
8d05b8b
fix imageformats webp
Neumann-A Dec 9, 2020
cc41493
fix qtdeclarative static builds msvc
Neumann-A Dec 9, 2020
1f661a8
more fixes
Neumann-A Dec 9, 2020
0e35771
make the rest of qt build succesfully. (only tested x64-windows)
Neumann-A Dec 10, 2020
1440f8e
format manifest.
Neumann-A Dec 10, 2020
2d2863b
[vcpkg_from_git] new options TAG and OUT_REF
Neumann-A Dec 10, 2020
2d0698e
fix importprefix in qml plugin targets in static builds
Neumann-A Dec 11, 2020
e8eb883
fix static qttools build on windows
Neumann-A Dec 11, 2020
6bdf422
move qml plugin fix into qtbase
Neumann-A Dec 11, 2020
ec05117
try fixing staqtic build issues.
Neumann-A Dec 11, 2020
e8a8aae
make comment in qtquickcontrols2
Neumann-A Dec 11, 2020
3618a5f
dont promote targets
Neumann-A Dec 11, 2020
1a7ca99
fix missing limits include
Neumann-A Dec 11, 2020
22f12e3
fix patch
Neumann-A Dec 11, 2020
a517cd8
pass options in qtopcua
Neumann-A Dec 11, 2020
8c89b3d
fix freetype linkage
Neumann-A Dec 14, 2020
31ad28d
fix freetype a bit different
Neumann-A Dec 14, 2020
815a809
fix promotion patch
Neumann-A Dec 14, 2020
efaa711
fix freetype wrapper without "
Neumann-A Dec 14, 2020
c5e2d80
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Dec 14, 2020
635d397
fix typo in patch
Neumann-A Dec 14, 2020
a570b58
enable build of qtopcua
Neumann-A Dec 14, 2020
fb70dc8
format manifest for ci to run
Neumann-A Dec 14, 2020
4731b55
retry promotion
Neumann-A Dec 14, 2020
3bea7b3
try again but explicity not promote Threads::Threads
Neumann-A Dec 14, 2020
072e7b4
push patch
Neumann-A Dec 14, 2020
359aaf0
[fontconfig] add vcpkg cmake wrapper.
Neumann-A Dec 15, 2020
ec5745f
Merge remote-tracking branch 'origin/add_wrapper_fontconfig' into qt6…
Neumann-A Dec 15, 2020
1f213bf
fix empty statement in the wrapper
Neumann-A Dec 16, 2020
89f52e3
Merge remote-tracking branch 'origin/add_wrapper_fontconfig' into qt6…
Neumann-A Dec 16, 2020
eff4eb9
show files in bin if any
Neumann-A Dec 16, 2020
a801380
Merge branch 'qt6-base' of https://github.com/Neumann-A/vcpkg into qt…
Neumann-A Dec 16, 2020
9dfcf66
Apply suggestions from code review
Neumann-A Jan 7, 2021
d4b5925
additional changes due to CR
Neumann-A Jan 7, 2021
640b29c
regenerate docs
Neumann-A Jan 7, 2021
353a286
Merge remote-tracking branch 'upstream/master' into from_git_support_…
Neumann-A Jan 7, 2021
037ee16
Merge branch 'master' into qt6-base
Neumann-A Jan 7, 2021
0b2edb0
Merge remote-tracking branch 'origin/from_git_support_tags' into qt6-…
Neumann-A Jan 7, 2021
741a823
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Jan 11, 2021
217e734
qdoc is build if llvm is present.
Neumann-A Jan 11, 2021
1b4a8b7
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Jan 11, 2021
b744976
fix merge issues
Neumann-A Jan 11, 2021
decb168
fix wayland deps
Neumann-A Jan 11, 2021
c773667
add qt5-base to skip for static-md
Neumann-A Jan 11, 2021
13e95e7
format manifest.
Neumann-A Jan 12, 2021
2898119
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Feb 9, 2021
a3817b2
update all qt ports. Lets see which patches need to be fixed/removed
Neumann-A Feb 9, 2021
58cd21d
fix some regressions by removing patches no longer necessary.
Neumann-A Feb 9, 2021
a633ad6
fix qtopcua
Neumann-A Feb 10, 2021
3b89419
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Feb 23, 2021
253c370
make qttools build on osx
Neumann-A Feb 23, 2021
93405c1
fix dependency of qttranslations
Neumann-A Feb 23, 2021
6b2cd72
fix qtwayland
Neumann-A Feb 23, 2021
0e8e462
fix typo
Neumann-A Feb 23, 2021
de0e2cf
fix case
Neumann-A Feb 24, 2021
42f3fb9
adjust ci baseline for qtwayland on osx due to missing system libs.
Neumann-A Feb 24, 2021
ea78925
create directory before rename
Neumann-A Feb 24, 2021
70f6f44
trying to make osx work
Neumann-A Feb 24, 2021
4c0b557
create the directory and move the files
Neumann-A Feb 24, 2021
f7f490f
move the removing outside the foreach ....
Neumann-A Feb 25, 2021
4d9b219
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Mar 3, 2021
7f46952
update to 6.0.2
Neumann-A Mar 3, 2021
4f4ee4b
remove some outdated patches
Neumann-A Mar 3, 2021
d9d0a3a
qt 6.1.0-beta1 ci testing
Neumann-A Mar 3, 2021
4d0086a
remove unused patches
Neumann-A Mar 3, 2021
27d6d50
fix a few issues with qt 6.1.0-beta1
Neumann-A Mar 3, 2021
bf4c34c
Fix missing qt cmake wrappers for qttools and qtshadertools.
Neumann-A Mar 4, 2021
aca1df8
block qt beta ports in CI
Neumann-A Mar 4, 2021
6752385
turn off beta build in CI
Neumann-A Mar 4, 2021
c6132e0
remove outdated patches
Neumann-A Mar 4, 2021
95649de
skip qt6 beta ports in CI
Neumann-A Mar 4, 2021
cd0c444
[gettext] add feature tools.
Neumann-A Mar 6, 2021
8a45203
switch hunspell to configure_make for pc files
Neumann-A Mar 6, 2021
f553bd4
switch to manifest
Neumann-A Mar 6, 2021
35029ed
hunspell remove port debug and add comment about tools
Neumann-A Mar 6, 2021
18b0f62
setup qtvirtualkeyboard features.
Neumann-A Mar 6, 2021
06460ba
fix manifest format CI
Neumann-A Mar 25, 2021
9529c05
only run wayland on linux
Neumann-A Mar 25, 2021
fc1da5e
disable pthread detection in gettext on windows
Neumann-A Mar 26, 2021
64df657
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Mar 26, 2021
f074af0
fix hunspell host dependency
Neumann-A Mar 26, 2021
c2d1d86
formant manifest
Neumann-A Mar 26, 2021
1ff5bd0
- add qt6 prefix
Neumann-A Mar 26, 2021
30240bf
cannot add qt6 to bin folder currently.
Neumann-A Mar 26, 2021
2639628
try the prefix method
Neumann-A Mar 28, 2021
63678f5
feature refinement
Neumann-A Mar 28, 2021
1427146
fix tools issues
Neumann-A Mar 29, 2021
a4c2858
update baseline
Neumann-A Mar 29, 2021
4f40054
more feature refinement.
Neumann-A Mar 29, 2021
5ee89b7
be less noise in logs
Neumann-A Mar 29, 2021
8f8c7d9
update version in gettext
Neumann-A Mar 29, 2021
5229ca0
add version details
Neumann-A Mar 29, 2021
048ff6d
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Mar 30, 2021
3d19686
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Mar 31, 2021
f67c874
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Mar 31, 2021
45c9db5
move on to qt version 6.0.3
Neumann-A Mar 31, 2021
4a360eb
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Mar 31, 2021
e3508ac
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Apr 1, 2021
9c1a1c5
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Apr 2, 2021
404fe40
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Apr 6, 2021
727e22d
build cmake test port against qt6
Neumann-A Apr 6, 2021
9dd1a24
move qt5 includes into include/qt5
Neumann-A Apr 7, 2021
cff9c2b
ws change in cmake to force rebuild
Neumann-A Apr 7, 2021
cae0677
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Apr 8, 2021
3ebe9c2
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Apr 8, 2021
375a571
version stuff
Neumann-A Apr 8, 2021
fa44f51
add plugin_config patch
Neumann-A Apr 9, 2021
65a83f2
version stuff
Neumann-A Apr 9, 2021
2b7ab35
use upstream plugin patch for 6.1
Neumann-A Apr 9, 2021
aca6932
version stuff
Neumann-A Apr 9, 2021
a966cd9
update to qt 6.1.0-beta3
Neumann-A Apr 9, 2021
ba3c5d8
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A Apr 9, 2021
3d38033
add alignment patch
Neumann-A Apr 10, 2021
1a08ceb
fix hunspell include path
Neumann-A Apr 10, 2021
4b4b63a
make the patch depend on architecture
Neumann-A Apr 11, 2021
1557d72
add qbittorrent as a test port
Neumann-A Apr 11, 2021
1e952ad
downgrade qbittorrent a bit so that in can run in CI
Neumann-A Apr 11, 2021
3f66ad1
remove bin in static builds
Neumann-A Apr 11, 2021
adbf71e
remove debug folder completly (since it is empty)
Neumann-A Apr 11, 2021
5543b95
copy additional deps required by qtshadertools and qtdeclarative in q…
Neumann-A Apr 11, 2021
bc95924
fix logic
Neumann-A Apr 11, 2021
2267fc5
try upstream alignment patch
Neumann-A Apr 12, 2021
6749604
update baseline
Neumann-A Apr 12, 2021
392b2f0
add feature options to qt5compat
Neumann-A Apr 16, 2021
3b33638
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A May 6, 2021
5d908aa
update to qt 6.1.0
Neumann-A May 6, 2021
40bfcbf
version stuff
Neumann-A May 6, 2021
dee5317
fix qt.conf (for release builds only)
Neumann-A May 6, 2021
20b1df2
fix install of missing FindX modules in qtimageformats which where su…
Neumann-A May 6, 2021
4ec7f0f
remove unnecessary patch
Neumann-A May 6, 2021
6cda819
version stuff
Neumann-A May 6, 2021
27db663
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A May 9, 2021
83862ec
fix some qt.conf stuff
Neumann-A May 9, 2021
dec9b82
install some wrappers for debug builds.
Neumann-A May 9, 2021
5c1bd09
fine tuning qt.conf
Neumann-A May 9, 2021
8166ef0
fix debug windeployqt install but somebody is linking release icudt i…
Neumann-A May 9, 2021
3350bfb
fix arm crossbuilds on windows
Neumann-A May 10, 2021
0baf78e
remove tools default line
Neumann-A May 10, 2021
7b0af20
version stuff
Neumann-A May 10, 2021
2334605
add missing host dependencies.
Neumann-A May 10, 2021
8e16e58
fix windeploy target correctly for debug
Neumann-A May 10, 2021
97fc2b8
fix cmake arm builds.
Neumann-A May 10, 2021
cff973e
some batch improvements
Neumann-A May 10, 2021
66c63f8
run qmake.debug.bat for debug builds.
Neumann-A May 10, 2021
66e9f2a
version stuff
Neumann-A May 10, 2021
7aa88a1
unconditionally include the patch in qtvirtualkeyboard
Neumann-A May 10, 2021
06deb8f
version stuff
Neumann-A May 10, 2021
3a0b53e
more host dependencies
Neumann-A May 11, 2021
bd635c5
version stuff
Neumann-A May 11, 2021
2a9263f
more host deps
Neumann-A May 11, 2021
c431129
version stuff
Neumann-A May 11, 2021
828b64e
fix qtactiveqt
Neumann-A May 11, 2021
04448c9
version stuff
Neumann-A May 11, 2021
45906ca
suppress batch skript output
Neumann-A May 11, 2021
4b4f873
version stuff
Neumann-A May 11, 2021
b76c1aa
Apply CR changes
Neumann-A May 12, 2021
15c4c6d
version stuff
Neumann-A May 12, 2021
ccc3278
newline attack
Neumann-A May 12, 2021
e0cc336
update qbittorrent test port and newline...
Neumann-A May 12, 2021
3df6f28
version stuff again
Neumann-A May 12, 2021
ecf2f2a
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A May 27, 2021
64158a8
Merge remote-tracking branch 'upstream/master' into qt6-base
Neumann-A May 31, 2021
ecdd36a
switch to version-semver
Neumann-A May 31, 2021
61f26d3
version stuff
Neumann-A May 31, 2021
d533956
remove qbittorrent test_port because
Neumann-A Jun 1, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ports/qt/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
50 changes: 50 additions & 0 deletions ports/qt/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"name": "qt",
"version-semver": "6.1.0",
"description": "Qt",
"homepage": "https://www.qt.io/",
"dependencies": [
"qt5compat",
{
"name": "qtbase",
"default-features": false
},
"qtcharts",
"qtcoap",
"qtdatavis3d",
"qtdeclarative",
"qtdoc",
"qtimageformats",
"qtlottie",
"qtmqtt",
"qtnetworkauth",
"qtopcua",
"qtquick3d",
"qtquickcontrols2",
"qtquicktimeline",
"qtscxml",
"qtshadertools",
"qtsvg",
"qttools",
"qttranslations",
"qtvirtualkeyboard"
],
"default-features": [
"default-features"
],
"features": {
"default-features": {
"description": "Platform-dependent default features",
"dependencies": [
{
"name": "qtactiveqt",
"platform": "windows"
},
{
"name": "qtwayland",
"platform": "linux"
}
]
}
}
}
28 changes: 28 additions & 0 deletions ports/qt5compat/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")

set(${PORT}_PATCHES)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"textcodec" FEATURE_textcodec
"codecs" FEATURE_codecs
"big-codecs" FEATURE_big_codecs
"iconv" FEATURE_iconv
"iconv" CMAKE_DISABLE_FIND_PACKAGE_ICU
INVERTED_FEATURES
"iconv" CMAKE_DISABLE_FIND_PACKAGE_WrapIconv
)

#For iconv feature to work the following must be true:
#CONDITION NOT FEATURE_icu AND FEATURE_textcodec AND NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND WrapIconv_FOUND
#TODO: check if qtbase was built with ICU and fail if iconv is given here.

set(TOOL_NAMES)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
TOOL_NAMES ${TOOL_NAMES}
CONFIGURE_OPTIONS
${FEATURE_OPTIONS}
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)
63 changes: 63 additions & 0 deletions ports/qt5compat/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"name": "qt5compat",
"version-semver": "6.1.0",
"description": "The module contains unsupported Qt 5 APIs",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "qtbase",
"default-features": false
}
],
"default-features": [
"big-codecs",
"codecs",
"default-features",
"textcodec"
],
"features": {
"big-codecs": {
"description": "Supports big codecs, e.g. CJK.",
"dependencies": [
{
"name": "qt5compat",
"default-features": false,
"features": [
"textcodec"
]
}
]
},
"codecs": {
"description": "Supports non-unicode text conversions.",
"dependencies": [
{
"name": "qt5compat",
"default-features": false,
"features": [
"textcodec"
]
}
]
},
"default-features": {
"description": "Platform-dependent default features"
},
"iconv": {
"description": "Provides internationalization on Unix.",
"dependencies": [
"libiconv",
{
"name": "qt5compat",
"default-features": false,
"features": [
"textcodec"
]
}
]
},
"textcodec": {
"description": "Supports conversions between text encodings."
}
}
}
1 change: 1 addition & 0 deletions ports/qt6betablock/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
12 changes: 12 additions & 0 deletions ports/qt6betablock/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "qt6betablock",
"version-semver": "6.2.0-beta",
"description": "Port to block qt6 ports not in the current release to be build in CI",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "qtbase",
"default-features": false
}
]
}
29 changes: 29 additions & 0 deletions ports/qtactiveqt/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")

set(${PORT}_PATCHES)

set(NO_BIN_AND_TOOLS FALSE)
if(VCPKG_TARGET_ARCHITECTURE MATCHES "^arm" AND VCPKG_TARGET_IS_WINDOWS)
set(NO_BIN_AND_TOOLS TRUE)
endif()

if(NOT NO_BIN_AND_TOOLS)
set(TOOL_NAMES
dumpcpp
dumpdoc
idc
testcon
)
endif()

qt_install_submodule(PATCHES ${${PORT}_PATCHES}
TOOL_NAMES ${TOOL_NAMES}
CONFIGURE_OPTIONS
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

if(NO_BIN_AND_TOOLS)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/tools")
endif()
22 changes: 22 additions & 0 deletions ports/qtactiveqt/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"name": "qtactiveqt",
"version-semver": "6.1.0",
"description": "ActiveQt",
"homepage": "https://www.qt.io/",
"supports": "windows",
"dependencies": [
{
"name": "qtactiveqt",
"host": true,
"default-features": false
},
{
"name": "qtbase",
"default-features": false
},
{
"name": "qttools",
"default-features": false
}
]
}
22 changes: 22 additions & 0 deletions ports/qtbase/allow_outside_prefix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index bd186c28b..2c1994d2e 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -28,11 +28,13 @@ function(qt_configure_process_path name default docstring)
elseif(rel_path MATCHES "^\.\./")
# INSTALL_SYSCONFDIR is allowed to be outside the prefix.
if(NOT name STREQUAL "INSTALL_SYSCONFDIR")
- message(FATAL_ERROR
- "Path component '${name}' is outside computed install prefix: ${rel_path} ")
- return()
+ #message(FATAL_ERROR
+ # "Path component '${name}' is outside computed install prefix: ${rel_path} ")
+ #return()
+ set("${name}" "${rel_path}" CACHE STRING "${docstring}" FORCE)
+ else()
+ set("${name}" "${${name}}" CACHE STRING "${docstring}" FORCE)
endif()
- set("${name}" "${${name}}" CACHE STRING "${docstring}" FORCE)
else()
set("${name}" "${rel_path}" CACHE STRING "${docstring}" FORCE)
endif()
41 changes: 41 additions & 0 deletions ports/qtbase/buildcmake.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index d08126731..efd1ada92 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -387,7 +387,7 @@ set(QT_KNOWN_MODULES_WITH_TOOLS "" CACHE INTERNAL "Known Qt modules with tools"

# Reset syncqt cache variable, to make sure it gets recomputed on reconfiguration, otherwise
# it might not get installed.
-unset(QT_SYNCQT CACHE)
+# unset(QT_SYNCQT CACHE)

# For adjusting variables when running tests, we need to know what
# the correct variable is for separating entries in PATH-alike
diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in
index 9eb913f4d..286f3287e 100644
--- a/cmake/QtBuildInternalsExtra.cmake.in
+++ b/cmake/QtBuildInternalsExtra.cmake.in
@@ -35,8 +35,8 @@ endif()
set(QT_WILL_INSTALL @QT_WILL_INSTALL@ CACHE BOOL
"Boolean indicating if doing a Qt prefix build (vs non-prefix build)." FORCE)

-set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH
-"A path to the source tree of the previously configured QtBase project." FORCE)
+# set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH
+# "A path to the source tree of the previously configured QtBase project." FORCE)

# Propagate decision of building tests and examples to other repositories.
set(QT_BUILD_TESTS @QT_BUILD_TESTS@ CACHE BOOL "Build the testing tree.")
diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
index 30d3bd6d3..80bb2bf46 100644
--- a/cmake/QtPrlHelpers.cmake
+++ b/cmake/QtPrlHelpers.cmake
@@ -222,7 +222,7 @@ function(qt_internal_walk_libs
qt_internal_should_not_promote_package_target_to_global(
"${lib_target_unaliased}" should_not_promote)
if(NOT is_global AND is_imported AND NOT should_not_promote)
- set_property(TARGET ${lib_target_unaliased} PROPERTY IMPORTED_GLOBAL TRUE)
+ #set_property(TARGET ${lib_target_unaliased} PROPERTY IMPORTED_GLOBAL TRUE)
endif()
endif()
else()
18 changes: 18 additions & 0 deletions ports/qtbase/cmake/qt_install_copyright.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#Could probably be the beginning of a vcpkg_install_copyright?
function(qt_install_copyright SOURCE_PATH)
#Find the relevant license file and install it
if(EXISTS "${SOURCE_PATH}/LICENSE.LGPLv3")
set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.LGPLv3")
elseif(EXISTS "${SOURCE_PATH}/LICENSE.LGPL3")
set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.LGPL3")
elseif(EXISTS "${SOURCE_PATH}/LICENSE.GPLv3")
set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.GPLv3")
elseif(EXISTS "${SOURCE_PATH}/LICENSE.GPL3")
set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.GPL3")
elseif(EXISTS "${SOURCE_PATH}/LICENSE.GPL3-EXCEPT")
set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.GPL3-EXCEPT")
elseif(EXISTS "${SOURCE_PATH}/LICENSE.FDL")
set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.FDL")
endif()
file(INSTALL "${LICENSE_PATH}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
endfunction()
Loading