Changeset 8127 in ntrip for trunk/BNC/qwt/qwt_global.h

Timestamp:

May 10, 2017, 3:20:54 PM (7 years ago)

Author:

stoecker

Message:

update qwt and qwtpolar, many QT5 fixes (unfinished)

File:

• trunk/BNC/qwt/qwt_global.h (modified) (3 diffs)

trunk/BNC/qwt/qwt_global.h

@@ -15 +15 @@
 // QWT_VERSION is (major << 16) + (minor << 8) + patch.
 
-#define QWT_VERSION       0x060001
-#define QWT_VERSION_STR   "6.0.1"
-
-#if defined(Q_WS_WIN) || defined(Q_WS_S60)
+#define QWT_VERSION       0x060104
+#define QWT_VERSION_STR   "6.1.4"
 
 #if defined(_MSC_VER) /* MSVC Compiler */
 /* template-class specialization 'identifier' is already instantiated */
 #pragma warning(disable: 4660)
+/* inherits via dominance */
+#pragma warning(disable: 4250)
 #endif // _MSC_VER
 
@@ -28 +28 @@
 
 #if defined(QWT_MAKEDLL)     // create a Qwt DLL library 
-#define QWT_EXPORT  __declspec(dllexport)
-#define QWT_TEMPLATEDLL
+#define QWT_EXPORT Q_DECL_EXPORT
 #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
 
 #ifndef QWT_EXPORT
@@ -42 +39 @@
 #endif
 
-// #define QWT_NO_COMPAT 1 // disable withdrawn functionality
-
 #endif