From 77a0d628f27dc83bd8eae44ee217a4e6f3cf0922 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Fri, 11 Jan 2019 13:59:40 +0100
Subject: [PATCH] Use Qwt from externals

---
 src/blackgui/blackgui.pro   | 21 ++++++++++++++++++---
 src/blackmisc/blackmisc.pro |  4 ++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/blackgui/blackgui.pro b/src/blackgui/blackgui.pro
index ed9c12112..e8f2b4a10 100644
--- a/src/blackgui/blackgui.pro
+++ b/src/blackgui/blackgui.pro
@@ -1,6 +1,6 @@
 load(common_pre)
 
-QT       += core dbus gui network svg widgets charts
+QT       += core dbus gui network svg widgets
 
 TARGET = blackgui
 TEMPLATE = lib
@@ -11,11 +11,12 @@ swiftConfig(static) {
 }
 
 INCLUDEPATH += ..
+INCLUDEPATH *= $$EXTERNALSROOT/common/include/qwt
 DEPENDPATH += . ..
 
 PRECOMPILED_HEADER = pch/pch.h
 
-DEFINES += LOG_IN_FILE BUILD_BLACKGUI_LIB
+DEFINES += LOG_IN_FILE BUILD_BLACKGUI_LIB QWT_DLL
 
 HEADERS += *.h
 SOURCES += *.cpp
@@ -42,6 +43,9 @@ HEADERS += $$PWD/editors/*.h
 SOURCES += $$PWD/editors/*.cpp
 FORMS   += $$PWD/editors/*.ui
 
+HEADERS += $$PWD/graphs/*.h
+SOURCES += $$PWD/graphs/*.cpp
+
 FORMS   += $$PWD/*.ui
 
 win32 {
@@ -49,7 +53,18 @@ win32 {
     SOURCES += $$PWD/win/*.cpp
 }
 
-RESOURCES +=
+win32 {
+    CONFIG(debug, debug|release): LIBS *= -lqwtd
+    CONFIG(release, debug|release): LIBS *= -lqwt
+}
+else:macx {
+    macx: LIBS *= -framework qwt
+}
+else:unix {
+    LIBS *= -lqwt
+}
+
+# RESOURCES +=
 
 DESTDIR = $$DestRoot/lib
 DLLDESTDIR = $$DestRoot/bin
diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro
index c75ec013e..4daba41ca 100644
--- a/src/blackmisc/blackmisc.pro
+++ b/src/blackmisc/blackmisc.pro
@@ -127,8 +127,8 @@ win32 {
     dest_path = $$DestRoot/bin
 }
 else:macx {
-    copy_command = cp
-    source_path = $$EXTERNALS_LIB_DIR/*.dylib
+    copy_command = cp -a
+    source_path = $$EXTERNALS_LIB_DIR/*.{dylib,framework}
     dest_path = $$DestRoot/lib
 }
 else:unix {