aboutsummaryrefslogtreecommitdiff
path: root/ports/qt5-tools
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2020-02-20 08:45:58 +0800
committerGitHub <noreply@github.com>2020-02-19 16:45:58 -0800
commit9db90b397d1257f5af62f57f0b4f53072803b6e2 (patch)
tree76489523bc0d10897588d65d56bf6dd964e5e6a4 /ports/qt5-tools
parent1be75a28bfce2084bb0b59ec92a6853f13d7be66 (diff)
downloadvcpkg-9db90b397d1257f5af62f57f0b4f53072803b6e2.tar.gz
vcpkg-9db90b397d1257f5af62f57f0b4f53072803b6e2.zip
Fix baseline error (#10051)
* Fix osx baseline * fix osg configure issue * re-trigger ci test * re-trigger ci test * [osg] Revert changes with osg and temporarily skip osg detection * trigger ci test * update baseline Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
Diffstat (limited to 'ports/qt5-tools')
-rw-r--r--ports/qt5-tools/CONTROL2
-rw-r--r--ports/qt5-tools/portfile.cmake2
2 files changed, 3 insertions, 1 deletions
diff --git a/ports/qt5-tools/CONTROL b/ports/qt5-tools/CONTROL
index bfa94474c..d77faa268 100644
--- a/ports/qt5-tools/CONTROL
+++ b/ports/qt5-tools/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-tools
-Version: 5.12.5-3
+Version: 5.12.5-4
Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications
Build-Depends: qt5-base, qt5-declarative, qt5-activeqt (windows)
diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake
index fdbfa8d8e..dcb121634 100644
--- a/ports/qt5-tools/portfile.cmake
+++ b/ports/qt5-tools/portfile.cmake
@@ -1,5 +1,7 @@
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
+
qt_submodule_installation()
+
if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
file(INSTALL "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/plugins/platforms")
endif() \ No newline at end of file