diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-29 16:10:12 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-29 16:10:12 (GMT) |
| commit | 139235cfc51bcf152610747cfc09d72bdea081bd (patch) | |
| tree | d9701819135f04ddfa64c210d7ba807e52cc72b3 /src/gui/kernel/qapplication_p.h | |
| parent | a3504361a19428c12ac7e044762f252d8ba2b26f (diff) | |
| parent | 65e0d7c3b63fc4c1d7df7603b926ca013794b321 (diff) | |
| download | Qt-139235cfc51bcf152610747cfc09d72bdea081bd.zip Qt-139235cfc51bcf152610747cfc09d72bdea081bd.tar.gz Qt-139235cfc51bcf152610747cfc09d72bdea081bd.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch
Diffstat (limited to 'src/gui/kernel/qapplication_p.h')
| -rw-r--r-- | src/gui/kernel/qapplication_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index da66aab..e9db8f3 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -223,7 +223,7 @@ public: #endif static bool quitOnLastWindowClosed; static void emitLastWindowClosed(); -#ifdef Q_OS_WINCE +#ifdef Q_WS_WINCE static int autoMaximizeThreshold; static bool autoSipEnabled; #endif @@ -362,7 +362,7 @@ public: #ifdef Q_WS_MAC static bool native_modal_dialog_active; #endif -#if defined(Q_WS_WIN) && !defined(Q_OS_WINCE) +#if defined(Q_WS_WIN) && !defined(Q_WS_WINCE) static bool inSizeMove; #endif |