From f6d747d5f0583c54f1392cd9baa586cab0c91e96 Mon Sep 17 00:00:00 2001
From: zedamota <josembarros@hotmail.com>
Date: Sat, 28 Jan 2012 22:07:45 +0000
Subject: [PATCH] Fixes scopegadget failure to load with Qt versions > 4.7.4

---
 ground/openpilotgcs/src/libs/qwt/src/qwt_global.h | 6 ++----
 ground/openpilotgcs/src/libs/qwt/src/src.pro      | 8 ++++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ground/openpilotgcs/src/libs/qwt/src/qwt_global.h b/ground/openpilotgcs/src/libs/qwt/src/qwt_global.h
index d1f27ab38..59974b5a9 100644
--- a/ground/openpilotgcs/src/libs/qwt/src/qwt_global.h
+++ b/ground/openpilotgcs/src/libs/qwt/src/qwt_global.h
@@ -24,16 +24,14 @@
 #pragma warning(disable: 4660)
 #endif // _MSC_VER
 
-#ifdef QWT_DLL
 
 #if defined(QWT_MAKEDLL)     // create a Qwt DLL library 
-#define QWT_EXPORT  __declspec(dllexport)
+#define QWT_EXPORT  Q_DECL_EXPORT
 #define QWT_TEMPLATEDLL
 #else                        // use a Qwt DLL library
-#define QWT_EXPORT  __declspec(dllimport)
+#define QWT_EXPORT  Q_DECL_IMPORT
 #endif
 
-#endif // QWT_DLL
 
 #endif // Q_WS_WIN || Q_WS_S60
 
diff --git a/ground/openpilotgcs/src/libs/qwt/src/src.pro b/ground/openpilotgcs/src/libs/qwt/src/src.pro
index 69a46dcf2..9c9ce2578 100644
--- a/ground/openpilotgcs/src/libs/qwt/src/src.pro
+++ b/ground/openpilotgcs/src/libs/qwt/src/src.pro
@@ -15,6 +15,14 @@ DEFINES += QWT_LIBRARY
 include(../../../openpilotgcslibrary.pri)
 include( ../qwtconfig.pri )
 
+#VVERSION = $$[QT_VERSION]
+contains(QWT_CONFIG, QwtDll) {
+CONFIG += dll
+win32|symbian: DEFINES += QT_DLL QWT_DLL QWT_MAKEDLL
+}
+else {
+CONFIG += staticlib
+}
 HEADERS += \
     qwt.h \
     qwt_abstract_scale_draw.h \