diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-08-21 02:32:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-08-21 02:32:50 +0200 |
| commit | 5a03b75c50b2e34552c7ec3e1e15e7b2a0128bf7 (patch) | |
| tree | 88e05cd6150e0b3cda4e8716668082c655007fb8 /src/plugins/platforms/windows/qwindowsscreen.cpp | |
| parent | 0e7724079f1eae283714ae12769d1372b8f85659 (diff) | |
| parent | 6553921dd537e416da2f4d1441ab6d63059cda60 (diff) | |
Merge dev into 5.12
Change-Id: I63f632b595f66d2fc93e9aa713500e3799e3df2a
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsscreen.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsscreen.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp index 29165ef72c..2eaf386d42 100644 --- a/src/plugins/platforms/windows/qwindowsscreen.cpp +++ b/src/plugins/platforms/windows/qwindowsscreen.cpp @@ -330,10 +330,7 @@ QRect QWindowsScreen::virtualGeometry(const QPlatformScreen *screen) // cf QScre return result; } -enum OrientationPreference // matching Win32 API ORIENTATION_PREFERENCE -#if defined(Q_COMPILER_CLASS_ENUM) || defined(Q_CC_MSVC) - : DWORD -#endif +enum OrientationPreference : DWORD // matching Win32 API ORIENTATION_PREFERENCE { orientationPreferenceNone = 0, orientationPreferenceLandscape = 0x1, |