1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
|
Make the examples compile when out of the qwt source tree.
--- a/examples/examples.pri
+++ b/examples/examples.pri
@@ -7,16 +7,17 @@
# modify it under the terms of the Qwt License, Version 1.0
###################################################################
+INCLUDEPATH += /usr/include/qwt
+
QWT_ROOT = $${PWD}/..
-include( $${QWT_ROOT}/qwtconfig.pri )
-include( $${QWT_ROOT}/qwtbuild.pri )
-include( $${QWT_ROOT}/qwtfunctions.pri )
+include( qwtconfig.pri )
+include( qwtbuild.pri )
+include( qwtfunctions.pri )
QWT_OUT_ROOT = $${OUT_PWD}/../..
TEMPLATE = app
-INCLUDEPATH += $${QWT_ROOT}/src
DEPENDPATH += $${QWT_ROOT}/src
!debug_and_release {
@@ -34,8 +35,11 @@
}
}
-QMAKE_RPATHDIR *= $${QWT_OUT_ROOT}/lib
-qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt)
+greaterThan(QT_MAJOR_VERSION, 4) {
+ qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt-qt5)
+} else {
+ qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt)
+}
greaterThan(QT_MAJOR_VERSION, 4) {
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -7,7 +7,7 @@
# modify it under the terms of the Qwt License, Version 1.0
################################################################
-include( $${PWD}/../qwtconfig.pri )
+include( qwtconfig.pri )
TEMPLATE = subdirs
|