Changeset 8127 in ntrip for trunk/BNC/qwtpolar/qwt_polar_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/qwtpolar/qwt_polar_global.h (modified) (2 diffs)

trunk/BNC/qwtpolar/qwt_polar_global.h

@@ -14 +14 @@
 // QWT_POLAR_VERSION is (major << 16) + (minor << 8) + patch.
 
-#define QWT_POLAR_VERSION       0x010000
-#define QWT_POLAR_VERSION_STR   "1.0.0"
-
-#if defined(Q_WS_WIN) || defined(Q_WS_S60)
+#define QWT_POLAR_VERSION       0x010101
+#define QWT_POLAR_VERSION_STR   "1.1.1"
 
 #if defined(_MSC_VER) /* MSVC Compiler */
@@ -26 +24 @@
 #ifdef QWT_POLAR_DLL
 
-#if defined(QWT_POLAR_MAKEDLL)     // create a Qwt DLL library 
-#define QWT_POLAR_EXPORT  __declspec(dllexport)
+#if defined(QWT_POLAR_MAKEDLL)     // create DLL library 
+#define QWT_POLAR_EXPORT  Q_DECL_EXPORT
 #define QWT_POLAR_TEMPLATEDLL
-#else                        // use a Qwt DLL library
-#define QWT_POLAR_EXPORT  __declspec(dllimport)
+#else                        // use DLL library
+#define QWT_POLAR_EXPORT  Q_DECL_IMPORT
 #endif
 
-#endif // QWT_POLAR_MAKEDLL
-
-#endif // Q_WS_WIN
+#endif // QWT_POLAR_DLL
 
 #ifndef QWT_POLAR_EXPORT