1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
|
Remove rpath from library and fix library dependencies
--- a/designer/designer.pro
+++ b/designer/designer.pro
@@ -83,8 +83,15 @@
# compile the path for finding the Qwt library
# into the plugin. Not supported on Windows !
- QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
- qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt)
+# QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
+ contains(QWT_CONFIG, QwtDll) {
+ greaterThan(QT_MAJOR_VERSION, 4) {
+ qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt-qt5)
+ } else {
+ qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt)
+ }
+ }
+
contains(QWT_CONFIG, QwtDll) {
|