aboutsummaryrefslogtreecommitdiff
path: root/ports/qt5-declarative
diff options
context:
space:
mode:
authorLennart Trunk <lennart.trunk@outlook.de>2019-05-09 00:15:26 +0200
committerVictor Romero <romerosanchezv@gmail.com>2019-05-08 15:15:26 -0700
commit38aeee774a94b4cdb085e450ff579a404cc161c3 (patch)
tree65f7e9ff50c563ea797135130260846765857f85 /ports/qt5-declarative
parent883dd409287db82c2d025d8972bc05016e49f73a (diff)
downloadvcpkg-38aeee774a94b4cdb085e450ff579a404cc161c3.tar.gz
vcpkg-38aeee774a94b4cdb085e450ff579a404cc161c3.zip
[qt5] update to 5.12.3 (#6127)
* update CONTROL files and version variable * fix qt5 linkage in debug * revert target_link_libraries to set_property * revert mqtt to 5.12.1 since 5.12.3 is not released yet * update mqtt to 5.12.3 * update hashes * remove unnecessary patch * fix qmldevtools debug linkage for qt5-tools
Diffstat (limited to 'ports/qt5-declarative')
-rw-r--r--ports/qt5-declarative/CONTROL2
-rw-r--r--ports/qt5-declarative/portfile.cmake9
2 files changed, 8 insertions, 3 deletions
diff --git a/ports/qt5-declarative/CONTROL b/ports/qt5-declarative/CONTROL
index 87b5a8da0..1ef033d17 100644
--- a/ports/qt5-declarative/CONTROL
+++ b/ports/qt5-declarative/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-declarative
-Version: 5.12.1
+Version: 5.12.3
Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.
Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-declarative/portfile.cmake b/ports/qt5-declarative/portfile.cmake
index adda51330..badeab882 100644
--- a/ports/qt5-declarative/portfile.cmake
+++ b/ports/qt5-declarative/portfile.cmake
@@ -2,6 +2,11 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtdeclarative e06032da5c1c151200215f55728b9ce0fac299076f0ca3150143525a56bcce15eb72f6aa982b439e3920d1cd7a30468b3f0913f135d644ecda277d763fb5e1b5)
+qt_modular_library(qtdeclarative 0caddcfee36cbf52bacd3a400d304511255715e2b5a58c1621ca8120610427c57511785457a9e7fa55975b86e7924a3cffddeb7e2e8e6622af85b7ebac35dd20)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/plugins/platforminputcontexts) \ No newline at end of file
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/plugins/platforminputcontexts)
+
+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}") \ No newline at end of file