diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2019-09-12 19:07:22 +0200 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-09-12 10:07:21 -0700 |
| commit | 96f4487c77fbf08518a9ee665612927c97ce8ebd (patch) | |
| tree | a7b610226f798bda208a6459f26afa9922fb5dde /ports/qt5-declarative | |
| parent | ecfc714b9adbdf8bf6b394dd6b46d9c56ca993ea (diff) | |
| download | vcpkg-96f4487c77fbf08518a9ee665612927c97ce8ebd.tar.gz vcpkg-96f4487c77fbf08518a9ee665612927c97ce8ebd.zip | |
[Qt] Update to 5.12.4 (#7667)
* update to 5.12.4
* removed port qt5-modularscripts and split it functionality into more functions into qt5-base
* added qt_port_hashes.cmake for simpler upgrade.
* added optional VCPKG_QT_HOST_MKSPEC and VCPKG_QT_TARGET_MKSPEC to select QTs build mkspecs from a triplet
* qt_<config>.conf are now copied from the build dir instead from the port dir
* fixed freetype dependencies.
* cleanup of vcpkg_qmake scripts. No strange/unclear replacements anymore.
* introduced vcpkg_buildpath_length_warning
* changed directory layout of the qt5 installation executables and mkspecs a bit.
Diffstat (limited to 'ports/qt5-declarative')
| -rw-r--r-- | ports/qt5-declarative/CONTROL | 8 | ||||
| -rw-r--r-- | ports/qt5-declarative/portfile.cmake | 27 |
2 files changed, 6 insertions, 29 deletions
diff --git a/ports/qt5-declarative/CONTROL b/ports/qt5-declarative/CONTROL index 9b9c79e62..e54bca0a1 100644 --- a/ports/qt5-declarative/CONTROL +++ b/ports/qt5-declarative/CONTROL @@ -1,4 +1,4 @@ -Source: qt5-declarative -Version: 5.12.3-2 -Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol. -Build-Depends: qt5-modularscripts, qt5-base +Source: qt5-declarative
+Version: 5.12.4
+Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.
+Build-Depends: qt5-base
diff --git a/ports/qt5-declarative/portfile.cmake b/ports/qt5-declarative/portfile.cmake index 4c1a11b24..2cd1cf479 100644 --- a/ports/qt5-declarative/portfile.cmake +++ b/ports/qt5-declarative/portfile.cmake @@ -1,25 +1,2 @@ -include(vcpkg_common_functions) - -include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) - -qt_modular_library(qtdeclarative 0caddcfee36cbf52bacd3a400d304511255715e2b5a58c1621ca8120610427c57511785457a9e7fa55975b86e7924a3cffddeb7e2e8e6622af85b7ebac35dd20) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/plugins/platforminputcontexts) - -if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(qt5decpath ${CURRENT_PACKAGES_DIR}/share/qt5/debug/mkspecs/modules/qt_lib_qmldevtools_private.pri) - file(READ "${qt5decpath}" _contents) - string(REPLACE [[QT.qmldevtools_private.libs = $$QT_MODULE_HOST_LIB_BASE]] [[QT.qmldevtools_private.libs = $$QT_MODULE_LIB_BASE]] _contents "${_contents}") - file(WRITE "${qt5decpath}" "${_contents}") -endif() - -# Copy qt5-declarative tools -# This is a temporary workaround and hope to fix and remove it after the version update. -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") - if (EXISTS ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/ ${CURRENT_PACKAGES_DIR}/tools/qt5/) - endif() - if (EXISTS ${CURRENT_PACKAGES_DIR}/lib/libQt5QmlDevTools.a) - file(COPY ${CURRENT_PACKAGES_DIR}/lib/libQt5QmlDevTools.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) - endif() -endif()
\ No newline at end of file +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
+qt_submodule_installation()
\ No newline at end of file |