Luigi Baldoni
3c25abcc02
- Update to 6.2.0 (boo#1187996) * MathML text renderer removed * Class Includes added * BSD License for examples * Spline interpolation * New plot items - Check the installed CHANGES-6.2 file for the complete list of changes. - Drop qwt-6.1.3-pkgconfig.patch. No longer needed - Rebase qwt-6.1.4-mkspecs.patch OBS-URL: https://build.opensuse.org/request/show/907266 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/qwt6?expand=0&rev=13
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
diff --git a/qwtconfig.pri b/qwtconfig.pri
|
|
index 0b054e0..63301e6 100644
|
|
--- a/qwtconfig.pri
|
|
+++ b/qwtconfig.pri
|
|
@@ -28,9 +28,9 @@ win32 {
|
|
# QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION
|
|
}
|
|
|
|
-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]/qwt6
|
|
+QWT_INSTALL_HEADERS = $$[QT_INSTALL_HEADERS]/qwt6
|
|
+QWT_INSTALL_LIBS = $$[QT_INSTALL_LIBS]
|
|
|
|
######################################################################
|
|
# Designer plugin
|
|
@@ -42,14 +42,12 @@ QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
|
|
# runtime environment of designer/creator.
|
|
######################################################################
|
|
|
|
-QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer
|
|
-
|
|
# linux distributors often organize the Qt installation
|
|
# their way and QT_INSTALL_PREFIX doesn't offer a good
|
|
# path. Also QT_INSTALL_PREFIX is only one of the default
|
|
# search paths of the designer - not the Qt creator
|
|
|
|
-#QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PREFIX]/plugins/designer
|
|
+QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PLUGINS]/designer
|
|
|
|
######################################################################
|
|
# Features
|
|
@@ -63,8 +61,7 @@ QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer
|
|
# with every Qt upgrade.
|
|
######################################################################
|
|
|
|
-QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features
|
|
-# QWT_INSTALL_FEATURES = $$[QT_INSTALL_PREFIX]/features
|
|
+QWT_INSTALL_FEATURES = $$[QMAKE_MKSPECS]/features
|
|
|
|
######################################################################
|
|
# Build the static/shared libraries.
|