77 lines
3.0 KiB
Diff
77 lines
3.0 KiB
Diff
--- qwt-6.2.0/qwtconfig.pri.orig 2021-07-18 12:19:33.000000000 +0100
|
|
+++ qwt-6.2.0/qwtconfig.pri 2021-07-19 08:10:23.644576700 +0100
|
|
@@ -24,12 +24,11 @@
|
|
}
|
|
|
|
win32 {
|
|
- QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION
|
|
- # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION
|
|
+ QWT_INSTALL_PREFIX = %VALUE_QWT_INSTALL_PREFIX%
|
|
}
|
|
|
|
-QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc
|
|
-QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include
|
|
+QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/share/doc/qwt-qt$${QT_MAJOR_VERSION}
|
|
+QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include/qwt-qt$${QT_MAJOR_VERSION}
|
|
QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
|
|
|
|
######################################################################
|
|
@@ -42,7 +41,7 @@
|
|
# runtime environment of designer/creator.
|
|
######################################################################
|
|
|
|
-QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer
|
|
+QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/share/qt$${QT_MAJOR_VERSION}/plugins/designer
|
|
|
|
# linux distributors often organize the Qt installation
|
|
# their way and QT_INSTALL_PREFIX doesn't offer a good
|
|
@@ -63,8 +62,7 @@
|
|
# with every Qt upgrade.
|
|
######################################################################
|
|
|
|
-QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features
|
|
-# QWT_INSTALL_FEATURES = $$[QT_INSTALL_PREFIX]/features
|
|
+QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/share/qt$${QT_MAJOR_VERSION}/mkspecs/features
|
|
|
|
######################################################################
|
|
# Build the static/shared libraries.
|
|
@@ -128,9 +128,9 @@
|
|
# environment of the designer/creator.
|
|
######################################################################
|
|
|
|
-win32 {
|
|
- QWT_CONFIG += QwtDesignerSelfContained
|
|
-}
|
|
+#win32 {
|
|
+# QWT_CONFIG += QwtDesignerSelfContained
|
|
+#}
|
|
|
|
######################################################################
|
|
# If you want to auto build the examples, enable the line below
|
|
@@ -137,7 +135,7 @@
|
|
# 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 +146,14 @@
|
|
# 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
|