diff options
Diffstat (limited to 'src/corelib/global')
-rw-r--r-- | src/corelib/global/qglobal.h | 12 | ||||
-rw-r--r-- | src/corelib/global/qnamespace.h | 68 | ||||
-rw-r--r-- | src/corelib/global/qt_pch.h | 2 |
3 files changed, 14 insertions, 68 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 3cc12aaf82..fda58336eb 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -856,7 +856,9 @@ namespace QT_NAMESPACE {} WIN16 - unsupported */ -#if defined(Q_OS_MSDOS) +#if defined (Q_WS_QPA) + +#elif defined(Q_OS_MSDOS) # define Q_WS_WIN16 # error "Qt requires Win32 and does not work with Windows 3.x" #elif defined(_WIN32_X11_) @@ -1139,7 +1141,7 @@ redefine to built-in booleans to make autotests work properly */ //defines the type for the WNDPROC on windows //the alignment needs to be forced for sse2 to not crash with mingw -#if defined(Q_WS_WIN) +#if defined(Q_OS_WIN) # if defined(Q_CC_MINGW) # define QT_ENSURE_STACK_ALIGNED_FOR_SSE __attribute__ ((force_align_arg_pointer)) # else @@ -1560,7 +1562,7 @@ public: #else # error "Qt not configured correctly, please run configure" #endif -#if defined(Q_WS_WIN) || defined(Q_OS_CYGWIN) +#if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN) enum WinVersion { WV_32s = 0x0001, WV_95 = 0x0002, @@ -1669,7 +1671,7 @@ inline QT3_SUPPORT bool qSysInfo(int *wordSize, bool *bigEndian) } #endif -#if defined(Q_WS_WIN) || defined(Q_OS_CYGWIN) +#if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN) #if defined(QT3_SUPPORT) inline QT3_SUPPORT bool qt_winUnicode() { return true; } inline QT3_SUPPORT int qWinVersion() { return QSysInfo::WindowsVersion; } @@ -1679,7 +1681,7 @@ inline QT3_SUPPORT int qWinVersion() { return QSysInfo::WindowsVersion; } #define QT_WA(unicode, ansi) unicode #define QT_WA_INLINE(unicode, ansi) (unicode) -#endif /* Q_WS_WIN */ +#endif /* Q_OS_WIN */ #ifndef Q_OUTOFLINE_TEMPLATE # define Q_OUTOFLINE_TEMPLATE diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 99479d0b63..70f13cf79f 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -272,13 +272,13 @@ public: Window = 0x00000001, Dialog = 0x00000002 | Window, Sheet = 0x00000004 | Window, - Drawer = 0x00000006 | Window, + Drawer = Sheet | Dialog, Popup = 0x00000008 | Window, - Tool = 0x0000000a | Window, - ToolTip = 0x0000000c | Window, - SplashScreen = 0x0000000e | Window, + Tool = Popup | Dialog, + ToolTip = Popup | Sheet, + SplashScreen = ToolTip | Dialog, Desktop = 0x00000010 | Window, - SubWindow = 0x00000012, + SubWindow = Desktop | Dialog, WindowType_Mask = 0x000000ff, MSWindowsFixedSizeDialogHint = 0x00000100, @@ -293,13 +293,7 @@ public: WindowContextHelpButtonHint = 0x00010000, WindowShadeButtonHint = 0x00020000, WindowStaysOnTopHint = 0x00040000, - // reserved for Qt3Support: - // WMouseNoMask = 0x00080000, - // WDestructiveClose = 0x00100000, - // WStaticContents = 0x00200000, - // WGroupLeader = 0x00400000, - // WShowModal = 0x00800000, - // WNoMousePropagation = 0x01000000, + CustomizeWindowHint = 0x02000000, WindowStaysOnBottomHint = 0x04000000, WindowCloseButtonHint = 0x08000000, @@ -309,56 +303,6 @@ public: WindowCancelButtonHint = 0x00100000, WindowSoftkeysVisibleHint = 0x40000000, WindowSoftkeysRespondHint = 0x80000000 - -#ifdef QT3_SUPPORT - , - WMouseNoMask = 0x00080000, - WDestructiveClose = 0x00100000, - WStaticContents = 0x00200000, - WGroupLeader = 0x00400000, - WShowModal = 0x00800000, - WNoMousePropagation = 0x01000000, - - WType_TopLevel = Window, - WType_Dialog = Dialog, - WType_Popup = Popup, - WType_Desktop = Desktop, - WType_Mask = WindowType_Mask, - - WStyle_Customize = 0, - WStyle_NormalBorder = 0, - WStyle_DialogBorder = MSWindowsFixedSizeDialogHint, - WStyle_NoBorder = FramelessWindowHint, - WStyle_Title = WindowTitleHint, - WStyle_SysMenu = WindowSystemMenuHint, - WStyle_Minimize = WindowMinimizeButtonHint, - WStyle_Maximize = WindowMaximizeButtonHint, - WStyle_MinMax = WStyle_Minimize | WStyle_Maximize, - WStyle_Tool = Tool, - WStyle_StaysOnTop = WindowStaysOnTopHint, - WStyle_ContextHelp = WindowContextHelpButtonHint, - - // misc flags - WPaintDesktop = 0, - WPaintClever = 0, - - WX11BypassWM = X11BypassWindowManagerHint, - WWinOwnDC = MSWindowsOwnDC, - WMacSheet = Sheet, - WMacDrawer = Drawer, - - WStyle_Splash = SplashScreen, - - WNoAutoErase = 0, - WRepaintNoErase = 0, - WNorthWestGravity = WStaticContents, - WType_Modal = Dialog | WShowModal, - WStyle_Dialog = Dialog, - WStyle_NoBorderEx = FramelessWindowHint, - WResizeNoErase = 0, - WMacNoSheet = 0 -#endif - }; Q_DECLARE_FLAGS(WindowFlags, WindowType) diff --git a/src/corelib/global/qt_pch.h b/src/corelib/global/qt_pch.h index 738026a9ed..0926e02af1 100644 --- a/src/corelib/global/qt_pch.h +++ b/src/corelib/global/qt_pch.h @@ -50,7 +50,7 @@ #if defined __cplusplus #include <qglobal.h> -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN # define _POSIX_ # include <limits.h> # undef _POSIX_ |