Skip to content

Commit 8dc8cc8

Browse files
committed
Support QT5 for Windows
Q_WS_WIN is not valid in QT5. Use Q_OS_WIN which is in QT4 and QT5
1 parent ba8e2cb commit 8dc8cc8

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

include/qwt3d_global.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// Create Qwt3d DLL if QWT3D_DLL is defined (Windows only)
1313
//
1414

15-
#if defined(Q_WS_WIN)
15+
#if defined(Q_OS_WIN)
1616
#if defined(_MSC_VER) /* MSVC Compiler */
1717
#pragma warning(disable: 4251) // dll interface required for stl templates
1818
//pragma warning(disable: 4244) // 'conversion' conversion from 'type1' to 'type2', possible loss of data
@@ -42,7 +42,7 @@
4242
#define QWT3D_TEMPLATEDLL
4343
#endif
4444

45-
#else // ! Q_WS_WIN
45+
#else // ! Q_OS_WIN
4646
#undef QWT3D_MAKEDLL /* ignore these for other platforms */
4747
#undef QWT3D_DLL
4848
#undef QWT3D_TEMPLATEDLL

include/qwt3d_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include <string>
1010

11-
#if defined(Q_WS_WIN)
11+
#if defined(Q_OS_WIN)
1212
#include <windows.h>
1313
#endif
1414

0 commit comments

Comments
 (0)