-
Notifications
You must be signed in to change notification settings - Fork 6.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[qwt-qt6] new port #20921
Merged
Merged
[qwt-qt6] new port #20921
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
{ | ||
"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 | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
{ | ||
"versions": [ | ||
{ | ||
"git-tree": "96c2132cd5810b4a9950650768fb759738d3b929", | ||
"version-semver": "6.2.0", | ||
"port-version": 0 | ||
} | ||
] | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is qwt-qt6 doesn't support osx or there are some issues about configure/build step?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
qwt supports macOS, but unfortunately it fails like qwt (qwt-qt5).
I don't know why as I don't use macos.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm testing on a mac now...