aboutsummaryrefslogtreecommitdiff
path: root/ports/qt5-canvas3d
diff options
context:
space:
mode:
authorAlexander Neumann <30894796+Neumann-A@users.noreply.github.com>2020-07-09 00:34:35 +0200
committerGitHub <noreply@github.com>2020-07-08 15:34:35 -0700
commit3bffe1c0493c1220d3db2803a53c79add20d63d2 (patch)
tree9f4b7fe02f0bc01f529ba2a626318373f1839cc9 /ports/qt5-canvas3d
parent6d4606fb795667ef58da5367dee867d6a350fff5 (diff)
downloadvcpkg-3bffe1c0493c1220d3db2803a53c79add20d63d2.tar.gz
vcpkg-3bffe1c0493c1220d3db2803a53c79add20d63d2.zip
[qt5] update qt to 5.15 and make ports depend on qt5-base[core]. (#11596)
* [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. * [qt5] update and remove patches * [baseline] skip qt5-canvas3d due to deprecation * [qwt] update to 6.1.4 and fix build issues * [qt5-webengine] remove old patches * [qwt] fix static patch * [qt5-location] add a message that the port has a sprious failure * [qt5-webengine] fix filename of patch * [qt5-webengine] add build.patch (ci is probably fast than me in checking for more errors) * [qt5-winextras] depend on qt5-base[core] Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [qt5-base] update latest feature (latest=core) * [baseline] remove qt5-webengine for nonstatic windows since CI can handle it now * [qt5-base] make qt5-base fail to get logs. * [angle] include missing egl sources. * [qt5-base] patch egl detection logic. * [baseline] remove qt-x11extras:x64-linux=fail * [qt5-base] need to be explicit about xcb to build qt5-x11extras * [CI] add necessary system libraries to linux CI * [qt5-base] remove comment to retry on linux * [qt5-base] add static_init patch for MSVC * [qt5-base] refined workaround to not regress linux and osx due to * [paraview] remove unnecessary patches with newer qt versions * [vcpkg/baseline] add webengine back to skip * [vtk] fix missing include regression using patch from upstream * [vtk] fix patch * [qt5-base] replace with patch from upstream * [paraview] use hdf5 1.10 api. * [paraview] bump control * Add more packages to Linux machines. * [qt5-base] forgot to add the patch * Delete 6943.diff Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/qt5-canvas3d')
-rw-r--r--ports/qt5-canvas3d/CONTROL4
-rw-r--r--ports/qt5-canvas3d/portfile.cmake7
2 files changed, 6 insertions, 5 deletions
diff --git a/ports/qt5-canvas3d/CONTROL b/ports/qt5-canvas3d/CONTROL
index 4ff840207..2da0b4737 100644
--- a/ports/qt5-canvas3d/CONTROL
+++ b/ports/qt5-canvas3d/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-canvas3d
-Version: 5.12.8
+Version: 0
Description: Qt5 Canvas 3d Module;
-Build-Depends: qt5-base
+Build-Depends: qt5-base[core]
diff --git a/ports/qt5-canvas3d/portfile.cmake b/ports/qt5-canvas3d/portfile.cmake
index d473c5625..14a8cbdb2 100644
--- a/ports/qt5-canvas3d/portfile.cmake
+++ b/ports/qt5-canvas3d/portfile.cmake
@@ -1,3 +1,4 @@
-set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
-include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
-qt_submodule_installation() \ No newline at end of file
+message(FATAL_ERROR "${PORT} has been deprecated and will be removed in the future from VCPKG")
+#set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
+#include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
+#qt_submodule_installation() \ No newline at end of file