diff options
| author | Alexander Neumann <alexander.neumann@hamburg.de> | 2019-09-20 12:24:23 +0200 |
|---|---|---|
| committer | Alexander Neumann <alexander.neumann@hamburg.de> | 2019-09-20 12:24:23 +0200 |
| commit | 5b1e426929b40a9b60809284993b424b841a28fc (patch) | |
| tree | bd12300ad859bababb7d4acc03700fd31949fddc /ports/qt5-script | |
| parent | 279e25aecfe30f55296881ea9b0236c1d6ee030a (diff) | |
| parent | 358ec0954d9b71b0def4fd4b4dbafdd0b8478d81 (diff) | |
| download | vcpkg-5b1e426929b40a9b60809284993b424b841a28fc.tar.gz vcpkg-5b1e426929b40a9b60809284993b424b841a28fc.zip | |
Merge remote-tracking branch 'upstream/master' into path_separator
# Conflicts:
# scripts/cmake/vcpkg_common_definitions.cmake
Diffstat (limited to 'ports/qt5-script')
| -rwxr-xr-x | ports/qt5-script/CONTROL | 4 | ||||
| -rwxr-xr-x | ports/qt5-script/portfile.cmake | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/ports/qt5-script/CONTROL b/ports/qt5-script/CONTROL index 4fe0bb028..1115d8766 100755 --- a/ports/qt5-script/CONTROL +++ b/ports/qt5-script/CONTROL @@ -1,4 +1,4 @@ Source: qt5-script
-Version: 5.12.3-1
-Build-Depends: qt5-base, qt5-modularscripts
+Version: 5.12.5
+Build-Depends: qt5-base
Description:Qt5 Script Module.
diff --git a/ports/qt5-script/portfile.cmake b/ports/qt5-script/portfile.cmake index 0d2a8418d..2cd1cf479 100755 --- a/ports/qt5-script/portfile.cmake +++ b/ports/qt5-script/portfile.cmake @@ -1,5 +1,2 @@ -
-include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-
-qt_modular_library(qtscript 4c4498acb39536bdc03643fb1717c7a47c82b1734cf67d17d40bc216084f01e837648d261f7f69e317387f9c6efa9aaa6b0df8f5532f55615252c95b1089ca1a)
+include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
+qt_submodule_installation()
\ No newline at end of file |