You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
68 lines
2.7 KiB
68 lines
2.7 KiB
5 years ago
|
diff -up qwt-6.1.5/qwtbuild.pri.qt_install_paths qwt-6.1.5/qwtbuild.pri
|
||
|
--- qwt-6.1.5/qwtbuild.pri.qt_install_paths 2020-07-13 13:22:57.829775189 -0500
|
||
|
+++ qwt-6.1.5/qwtbuild.pri 2020-07-13 13:23:39.719159410 -0500
|
||
|
@@ -14,7 +14,7 @@
|
||
5 years ago
|
CONFIG += qt
|
||
11 years ago
|
CONFIG += warn_on
|
||
|
CONFIG += no_keywords
|
||
|
-CONFIG += silent
|
||
|
+#CONFIG += silent
|
||
5 years ago
|
|
||
|
DEFINES += QT_NO_DEPRECATED_WARNINGS # not fixing those before Qwt 6.2
|
||
|
|
||
|
diff -up qwt-6.1.5/qwtconfig.pri.qt_install_paths qwt-6.1.5/qwtconfig.pri
|
||
|
--- qwt-6.1.5/qwtconfig.pri.qt_install_paths 2020-06-01 11:48:07.325112226 -0500
|
||
|
+++ qwt-6.1.5/qwtconfig.pri 2020-07-13 13:22:57.831775207 -0500
|
||
10 years ago
|
@@ -19,7 +19,7 @@ QWT_VERSION = $${QWT_VER_MAJ}.$${QW
|
||
11 years ago
|
QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
|
||
|
|
||
10 years ago
|
unix {
|
||
11 years ago
|
- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION
|
||
10 years ago
|
+ # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION
|
||
|
# QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION
|
||
|
}
|
||
11 years ago
|
|
||
10 years ago
|
@@ -28,9 +28,9 @@ win32 {
|
||
|
# QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION
|
||
11 years ago
|
}
|
||
|
|
||
|
-QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc
|
||
|
-QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include
|
||
|
-QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
|
||
|
+QWT_INSTALL_DOCS = $$[QT_INSTALL_DOCS]/html
|
||
|
+QWT_INSTALL_HEADERS = $$[QT_INSTALL_HEADERS]/qwt
|
||
|
+QWT_INSTALL_LIBS = $$[QT_INSTALL_LIBS]
|
||
|
|
||
|
######################################################################
|
||
|
# Designer plugin
|
||
10 years ago
|
@@ -42,7 +42,8 @@ QWT_INSTALL_LIBS = $${QWT_INSTALL_P
|
||
11 years ago
|
# runtime environment of designer/creator.
|
||
|
######################################################################
|
||
|
|
||
|
-QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer
|
||
|
+#QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer
|
||
|
+QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PLUGINS]/designer
|
||
|
|
||
|
# linux distributors often organize the Qt installation
|
||
|
# their way and QT_INSTALL_PREFIX doesn't offer a good
|
||
10 years ago
|
@@ -63,8 +64,8 @@ QWT_INSTALL_PLUGINS = $${QWT_INSTALL_P
|
||
5 years ago
|
# with every Qt upgrade.
|
||
11 years ago
|
######################################################################
|
||
|
|
||
|
-QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features
|
||
|
-# QWT_INSTALL_FEATURES = $$[QT_INSTALL_PREFIX]/features
|
||
|
+#QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features
|
||
|
+QWT_INSTALL_FEATURES = $$[QMAKE_MKSPECS]/features
|
||
|
|
||
|
######################################################################
|
||
|
# Build the static/shared libraries.
|
||
10 years ago
|
@@ -110,7 +111,7 @@ QWT_CONFIG += QwtOpenGL
|
||
11 years ago
|
# to your qmake project file.
|
||
|
######################################################################
|
||
|
|
||
|
-#QWT_CONFIG += QwtMathML
|
||
|
+QWT_CONFIG += QwtMathML
|
||
|
|
||
|
######################################################################
|
||
5 years ago
|
# If you want to build the Qwt designer plugin,
|