diff options
| author | Eskil Abrahamsen Blomfeldt <eblomfel@trolltech.com> | 2009-08-24 12:31:18 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eblomfel@trolltech.com> | 2009-08-24 12:33:44 (GMT) |
| commit | d4aefc60abf3e014633b9a7544cb4b701864a061 (patch) | |
| tree | 6a4a1fdc501ffaa2f9129a34ece135bce9b372e4 /src/gui/kernel | |
| parent | d09a2d662080e1b1d2c53cc64a42bb5fa7e63745 (diff) | |
| download | Qt-d4aefc60abf3e014633b9a7544cb4b701864a061.zip Qt-d4aefc60abf3e014633b9a7544cb4b701864a061.tar.gz Qt-d4aefc60abf3e014633b9a7544cb4b701864a061.tar.bz2 | |
Compile after a41d614eb8afd7c1c5b95b8ac34335fc0aaf0a18
Change a41d614 sets _WIN32_WINNT to 0x500, which will cause
FAPPCOMMAND_MOUSE to be defined in the PlatformSDK, but not
APPCOMMAND_MICROPHONE_VOLUME_MUTE (which requires 0x501 for the
version.) The check for APPCOMMAND_MICROPHONE_VOLUME_MUTE would thus
be #ifdef'd out and compilation would fail.
Reviewed-by: Thierry
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qapplication_win.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index 12cd879..76a3b1e 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -323,6 +323,7 @@ extern HRGN qt_tryCreateRegion(QRegion::RegionType type, int left, int top, int #define APPCOMMAND_BASS_UP 21 #define APPCOMMAND_TREBLE_DOWN 22 #define APPCOMMAND_TREBLE_UP 23 +#endif // FAPPCOMMAND_MOUSE // New commands from Windows XP (some even Sp1) #ifndef APPCOMMAND_MICROPHONE_VOLUME_MUTE @@ -357,8 +358,6 @@ extern HRGN qt_tryCreateRegion(QRegion::RegionType type, int left, int top, int #define APPCOMMAND_MEDIA_CHANNEL_DOWN 52 #endif // APPCOMMAND_MICROPHONE_VOLUME_MUTE -#endif // FAPPCOMMAND_MOUSE - #if (_WIN32_WINNT < 0x0400) // This struct is defined in winuser.h if the _WIN32_WINNT >= 0x0400 -- in the // other cases we have to define it on our own. |