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.
92 lines
3.6 KiB
92 lines
3.6 KiB
diff -up qwt-6.1.0/designer/designer.pro.qt_install_paths qwt-6.1.0/designer/designer.pro
|
|
--- qwt-6.1.0/designer/designer.pro.qt_install_paths 2013-05-30 10:18:27.753341938 -0500
|
|
+++ qwt-6.1.0/designer/designer.pro 2013-10-29 10:19:50.587458161 -0500
|
|
@@ -84,7 +84,7 @@ contains(QWT_CONFIG, QwtDesigner) {
|
|
# compile the path for finding the Qwt library
|
|
# into the plugin. Not supported on Windows !
|
|
|
|
- QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
|
|
+ #QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
|
|
|
|
contains(QWT_CONFIG, QwtFramework) {
|
|
|
|
diff -up qwt-6.1.0/qwtbuild.pri.qt_install_paths qwt-6.1.0/qwtbuild.pri
|
|
--- qwt-6.1.0/qwtbuild.pri.qt_install_paths 2013-05-30 10:18:27.762341938 -0500
|
|
+++ qwt-6.1.0/qwtbuild.pri 2013-10-29 10:19:50.588458143 -0500
|
|
@@ -14,8 +14,7 @@
|
|
CONFIG += qt
|
|
CONFIG += warn_on
|
|
CONFIG += no_keywords
|
|
-CONFIG += silent
|
|
-
|
|
+#CONFIG += silent
|
|
######################################################################
|
|
# release/debug mode
|
|
######################################################################
|
|
@@ -73,7 +72,7 @@ RCC_DIR = resources
|
|
|
|
unix {
|
|
|
|
- exists( $${QMAKE_LIBDIR_QT}/libqwt.* ) {
|
|
+ exists( $${QMAKE_LIBDIR_QT}/libqwt.so ) {
|
|
|
|
# On some Linux distributions the Qwt libraries are installed
|
|
# in the same directory as the Qt libraries. Unfortunately
|
|
diff -up qwt-6.1.0/qwtconfig.pri.qt_install_paths qwt-6.1.0/qwtconfig.pri
|
|
--- qwt-6.1.0/qwtconfig.pri.qt_install_paths 2013-05-30 10:18:27.767341938 -0500
|
|
+++ qwt-6.1.0/qwtconfig.pri 2013-10-29 10:20:30.618729032 -0500
|
|
@@ -18,17 +18,17 @@ QWT_VERSION = $${QWT_VER_MAJ}.$${QW
|
|
|
|
QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
|
|
|
|
-unix {
|
|
- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION
|
|
-}
|
|
+#unix {
|
|
+# QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION
|
|
+#}
|
|
|
|
win32 {
|
|
QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_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]/html
|
|
+QWT_INSTALL_HEADERS = $$[QT_INSTALL_HEADERS]/qwt
|
|
+QWT_INSTALL_LIBS = $$[QT_INSTALL_LIBS]
|
|
|
|
######################################################################
|
|
# Designer plugin
|
|
@@ -40,7 +40,8 @@ QWT_INSTALL_LIBS = $${QWT_INSTALL_P
|
|
# 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
|
|
@@ -61,8 +62,8 @@ QWT_INSTALL_PLUGINS = $${QWT_INSTALL_P
|
|
# with every Qt upgrade.
|
|
######################################################################
|
|
|
|
-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.
|
|
@@ -108,7 +109,7 @@ QWT_CONFIG += QwtOpenGL
|
|
# to your qmake project file.
|
|
######################################################################
|
|
|
|
-#QWT_CONFIG += QwtMathML
|
|
+QWT_CONFIG += QwtMathML
|
|
|
|
######################################################################
|
|
# If you want to build the Qwt designer plugin,
|