diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-06-21 22:45:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-21 13:45:33 -0700 |
| commit | 33d9cd45ffb089f790c7979653a906f28a35df98 (patch) | |
| tree | 7e0c7d4840b2d11f89451eb2545e1e1f5a017568 /ports/qttools | |
| parent | ec5178efe5c743413f0a07137fbdff47be970e0f (diff) | |
| download | vcpkg-33d9cd45ffb089f790c7979653a906f28a35df98.tar.gz vcpkg-33d9cd45ffb089f790c7979653a906f28a35df98.zip | |
[Qt6] Update to 6.1.1 (#18320)
* [qt6] Update to 6.1.1
* version stuff
* fix empty dir
* update version
* fix casing in qtbase
* [libpq] add secure32.lib on windows
* add clang-cl fix
* version stuff
* fix flag removal by adding a space
* version stuff
* make qt6->Qt6 usage consistent since Qt6 refers to itself as Qt6 with uppercase Q
* fix libpq wrapper opensll linkage on linux
* use policy to fix dependent ports
* version stuff
* use upstream patch
* version stuff
* fix source location for clang-cl
* version stuff
* remove ws change
* version stuff
Diffstat (limited to 'ports/qttools')
| -rw-r--r-- | ports/qttools/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/qttools/vcpkg.json | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ports/qttools/portfile.cmake b/ports/qttools/portfile.cmake index f65cf8ce1..c621e0c93 100644 --- a/ports/qttools/portfile.cmake +++ b/ports/qttools/portfile.cmake @@ -86,9 +86,9 @@ if(VCPKG_TARGET_IS_OSX) endif() set(configfile "${CURRENT_PACKAGES_DIR}/share/Qt6ToolsTools/Qt6ToolsToolsTargets-debug.cmake") -if(EXISTS "${configfile}" AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/qt6/bin/windeployqt.exe") - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/windeployqt.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt6/bin") +if(EXISTS "${configfile}" AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/windeployqt.exe") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/windeployqt.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") file(READ "${configfile}" _contents) - string(REPLACE [[${_IMPORT_PREFIX}/tools/qt6/bin/windeployqt.exe]] [[${_IMPORT_PREFIX}/tools/qt6/bin/windeployqt.debug.bat]] _contents "${_contents}") + string(REPLACE [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.exe]] [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.debug.bat]] _contents "${_contents}") file(WRITE "${configfile}" "${_contents}") endif() diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index 86d9efa48..7567f2220 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttools", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "Qt Tools", "homepage": "https://www.qt.io/", "dependencies": [ |