Remove qwt-qt6 due to conflict with qwt. (#21825)

This commit is contained in:
Billy O'Neal 2021-12-02 19:38:23 -08:00 committed by GitHub
parent 163065a352
commit a4a63e774b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 101 deletions

View File

@ -1,30 +0,0 @@
diff --git a/qwtconfig.pri b/qwtconfig.pri
index 0b054e0..d922aff 100644
--- a/qwtconfig.pri
+++ b/qwtconfig.pri
@@ -137,7 +137,7 @@ win32 {
# Otherwise you have to build them from the examples directory.
######################################################################
-QWT_CONFIG += QwtExamples
+#QWT_CONFIG += QwtExamples
######################################################################
# The playground is primarily intended for the Qwt development
@@ -148,14 +148,14 @@ QWT_CONFIG += QwtExamples
# Otherwise you have to build them from the playground directory.
######################################################################
-QWT_CONFIG += QwtPlayground
+#QWT_CONFIG += QwtPlayground
######################################################################
# If you want to auto build the tests, enable the line below
# Otherwise you have to build them from the tests directory.
######################################################################
-QWT_CONFIG += QwtTests
+#QWT_CONFIG += QwtTests
######################################################################
# When Qt has been built as framework qmake wants

View File

@ -1,37 +0,0 @@
vcpkg_from_sourceforge(
OUT_SOURCE_PATH SOURCE_PATH
REPO qwt/qwt
REF 6.2.0
FILENAME "qwt-6.2.0.zip"
SHA512 a3946c6e23481b5a2193819a1c1298db5a069d514ca60de54accb3a249403f5acd778172ae6fae24fae252767b1e58deba524de6225462f1bafd7c947996aae9
PATCHES disable-examples-playground-tests.patch
)
vcpkg_qmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
"CONFIG+=${VCPKG_LIBRARY_LINKAGE}"
)
if (VCPKG_TARGET_IS_WINDOWS)
vcpkg_install_qmake(
RELEASE_TARGETS sub-src-release_ordered
DEBUG_TARGETS sub-src-debug_ordered
)
else ()
vcpkg_install_qmake(
RELEASE_TARGETS sub-src-all-ordered
DEBUG_TARGETS sub-src-all-ordered
)
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
#Install the header files
file(GLOB HEADER_FILES "${SOURCE_PATH}/src/*.h")
file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

View File

@ -1,30 +0,0 @@
{
"name": "qwt-qt6",
"version-semver": "6.2.0",
"description": "qt widgets library for technical applications",
"homepage": "https://sourceforge.net/projects/qwt",
"dependencies": [
{
"name": "qtbase",
"default-features": false,
"features": [
"concurrent",
"gui",
"widgets"
]
},
"qtsvg",
{
"name": "qttools",
"default-features": false,
"features": [
"designer"
]
},
{
"name": "vcpkg-qmake",
"host": true,
"default-features": false
}
]
}

View File

@ -5856,10 +5856,6 @@
"baseline": "6.2.0", "baseline": "6.2.0",
"port-version": 1 "port-version": 1
}, },
"qwt-qt6": {
"baseline": "6.2.0",
"port-version": 0
},
"qwtw": { "qwtw": {
"baseline": "3.1.0", "baseline": "3.1.0",
"port-version": 1 "port-version": 1