- qwt-6.1.0 - QtDesigner plugin doesn't link to the proper header directory path (#824447)epel9
Rex Dieter
11 years ago
parent
06311328c8
commit
bd8a95efd2
@ -1,3 +1 @@
|
||||
/qwt-5.2.1.tar.bz2
|
||||
/qwt-5.2.2.tar.bz2
|
||||
/qwt-6.0.1.tar.bz2
|
||||
/qwt-6.1.0.tar.bz2
|
||||
|
||||
@ -1,64 +0,0 @@
|
||||
diff -up qwt-6.0.1/qwtbuild.pri.install-qt qwt-6.0.1/qwtbuild.pri
|
||||
--- qwt-6.0.1/qwtbuild.pri.install-qt 2011-08-01 09:33:53.000000000 -0500
|
||||
+++ qwt-6.0.1/qwtbuild.pri 2012-11-26 16:32:07.290520771 -0600
|
||||
@@ -14,7 +14,6 @@
|
||||
CONFIG += qt
|
||||
CONFIG += warn_on
|
||||
CONFIG += no_keywords
|
||||
-CONFIG += silent
|
||||
|
||||
######################################################################
|
||||
# release/debug mode
|
||||
@@ -56,7 +55,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.0.1/qwtconfig.pri.install-qt qwt-6.0.1/qwtconfig.pri
|
||||
--- qwt-6.0.1/qwtconfig.pri.install-qt 2011-08-01 09:33:53.000000000 -0500
|
||||
+++ qwt-6.0.1/qwtconfig.pri 2012-11-26 16:29:01.360797707 -0600
|
||||
@@ -18,6 +18,13 @@ QWT_VERSION = $${QWT_VER_MAJ}.$${QW
|
||||
|
||||
QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
|
||||
|
||||
+CONFIG(install-qt) {
|
||||
+QWT_INSTALL_DOCS = $$[QT_INSTALL_DOCS]/html
|
||||
+QWT_INSTALL_HEADERS = $$[QT_INSTALL_HEADERS]/qwt
|
||||
+QWT_INSTALL_LIBS = $$[QT_INSTALL_LIBS]
|
||||
+QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PLUGINS]/designer
|
||||
+QWT_INSTALL_FEATURES = $$[QMAKE_MKSPECS]/features
|
||||
+} else {
|
||||
unix {
|
||||
QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION
|
||||
}
|
||||
@@ -51,6 +58,7 @@ QWT_INSTALL_PLUGINS = $${QWT_INSTALL_P
|
||||
|
||||
QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features
|
||||
# QWT_INSTALL_FEATURES = $${QT_INSTALL_PREFIX}/features
|
||||
+}
|
||||
|
||||
######################################################################
|
||||
# Build the static/shared libraries.
|
||||
diff -up qwt-6.0.1/src/src.pro.install-qt qwt-6.0.1/src/src.pro
|
||||
--- qwt-6.0.1/src/src.pro.install-qt 2011-08-01 09:33:53.000000000 -0500
|
||||
+++ qwt-6.0.1/src/src.pro 2012-11-26 16:29:01.361797695 -0600
|
||||
@@ -16,6 +16,15 @@ include( $${QWT_ROOT}/qwtbuild.pri )
|
||||
TEMPLATE = lib
|
||||
TARGET = $$qtLibraryTarget(qwt)
|
||||
|
||||
+# pkgconfig support
|
||||
+CONFIG += create_pc create_prl no_install_prl
|
||||
+QMAKE_PKGCONFIG_NAME = qwt
|
||||
+QMAKE_PKGCONFIG_DESCRIPTION = Qt Widgets for Technical Applications
|
||||
+QMAKE_PKGCONFIG_LIBDIR = $${QWT_INSTALL_LIBS}
|
||||
+QMAKE_PKGCONFIG_INCDIR = $${QWT_INSTALL_HEADERS}
|
||||
+QMAKE_PKGCONFIG_REQUIRES = QtGui QtSvg
|
||||
+QMAKE_PKGCONFIG_DESTDIR = pkgconfig
|
||||
+
|
||||
DESTDIR = $${QWT_ROOT}/lib
|
||||
|
||||
contains(QWT_CONFIG, QwtDll) {
|
||||
@ -0,0 +1,19 @@
|
||||
diff -up qwt-6.1.0/src/src.pro.pkgconfig qwt-6.1.0/src/src.pro
|
||||
--- qwt-6.1.0/src/src.pro.pkgconfig 2013-05-30 10:18:27.693341940 -0500
|
||||
+++ qwt-6.1.0/src/src.pro 2013-10-29 10:04:22.131359701 -0500
|
||||
@@ -17,6 +17,15 @@ include( $${QWT_ROOT}/qwtfunctions.pri )
|
||||
TEMPLATE = lib
|
||||
TARGET = $$qwtLibraryTarget(qwt)
|
||||
|
||||
+# pkgconfig support
|
||||
+CONFIG += create_pc create_prl no_install_prl
|
||||
+QMAKE_PKGCONFIG_NAME = qwt
|
||||
+QMAKE_PKGCONFIG_DESCRIPTION = Qt Widgets for Technical Applications
|
||||
+QMAKE_PKGCONFIG_LIBDIR = $${QWT_INSTALL_LIBS}
|
||||
+QMAKE_PKGCONFIG_INCDIR = $${QWT_INSTALL_HEADERS}
|
||||
+QMAKE_PKGCONFIG_REQUIRES = QtGui QtSvg
|
||||
+QMAKE_PKGCONFIG_DESTDIR = pkgconfig
|
||||
+
|
||||
DESTDIR = $${QWT_ROOT}/lib
|
||||
|
||||
contains(QWT_CONFIG, QwtDll) {
|
||||
@ -0,0 +1,91 @@
|
||||
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,
|
||||
Loading…
Reference in new issue