summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qglobal.h60
-rw-r--r--src/corelib/global/qnamespace.h21
-rw-r--r--src/corelib/global/qt_pch.h2
3 files changed, 47 insertions, 36 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 56022a7e6e..94e0197a4a 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -289,7 +289,7 @@ namespace QT_NAMESPACE {}
#endif
#if defined(Q_OS_DARWIN)
-# define Q_OS_MAC /* Q_OS_MAC is mostly for compatibility, but also more clear */
+# define Q_OS_MAC
# define Q_OS_MACX /* Q_OS_MACX is only for compatibility.*/
# if defined(Q_OS_DARWIN64)
# define Q_OS_MAC64
@@ -298,15 +298,6 @@ namespace QT_NAMESPACE {}
# endif
#endif
-#ifdef QT_AUTODETECT_COCOA
-# ifdef Q_OS_MAC64
-# define QT_MAC_USE_COCOA 1
-# define QT_BUILD_KEY QT_BUILD_KEY_COCOA
-# else
-# define QT_BUILD_KEY QT_BUILD_KEY_CARBON
-# endif
-#endif
-
#if defined(Q_WS_MAC64) && !defined(QT_MAC_USE_COCOA) && !defined(QT_BUILD_QMAKE) && !defined(QT_BOOTSTRAPPED)
#error "You are building a 64-bit application, but using a 32-bit version of Qt. Check your build configuration."
#endif
@@ -880,7 +871,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_)
@@ -900,15 +893,7 @@ namespace QT_NAMESPACE {}
# define Q_WS_PM
# error "Qt does not work with OS/2 Presentation Manager or Workplace Shell"
#elif defined(Q_OS_UNIX)
-# if defined(Q_OS_MAC) && !defined(__USE_WS_X11__) && !defined(Q_WS_QWS) && !defined(Q_WS_QPA)
-# define Q_WS_MAC
-# define Q_WS_MACX
-# if defined(Q_OS_MAC64)
-# define Q_WS_MAC64
-# elif defined(Q_OS_MAC32)
-# define Q_WS_MAC32
-# endif
-# elif defined(Q_OS_SYMBIAN)
+# if defined(Q_OS_SYMBIAN)
# if !defined(QT_NO_S60)
# define Q_WS_S60
# endif
@@ -1146,7 +1131,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
@@ -1275,6 +1260,16 @@ class QDataStream;
# else
# define Q_GUI_EXPORT Q_DECL_IMPORT
# endif
+# if defined(QT_BUILD_WIDGETS_LIB)
+# define Q_WIDGETS_EXPORT Q_DECL_EXPORT
+# else
+# define Q_WIDGETS_EXPORT Q_DECL_IMPORT
+# endif
+# if defined(QT_BUILD_PRINTSUPPORT_LIB)
+# define Q_PRINTSUPPORT_EXPORT Q_DECL_EXPORT
+# else
+# define Q_PRINTSUPPORT_EXPORT Q_DECL_IMPORT
+# endif
# if defined(QT_BUILD_SQL_LIB)
# define Q_SQL_EXPORT Q_DECL_EXPORT
# else
@@ -1359,6 +1354,8 @@ class QDataStream;
# elif defined(QT_DLL) /* use a Qt DLL library */
# define Q_CORE_EXPORT Q_DECL_IMPORT
# define Q_GUI_EXPORT Q_DECL_IMPORT
+# define Q_WIDGETS_EXPORT Q_DECL_IMPORT
+# define Q_PRINTSUPPORT_EXPORT Q_DECL_IMPORT
# define Q_SQL_EXPORT Q_DECL_IMPORT
# define Q_NETWORK_EXPORT Q_DECL_IMPORT
# define Q_SVG_EXPORT Q_DECL_IMPORT
@@ -1391,6 +1388,8 @@ class QDataStream;
# if defined(QT_SHARED)
# define Q_CORE_EXPORT Q_DECL_EXPORT
# define Q_GUI_EXPORT Q_DECL_EXPORT
+# define Q_WIDGETS_EXPORT Q_DECL_EXPORT
+# define Q_PRINTSUPPORT_EXPORT Q_DECL_EXPORT
# define Q_SQL_EXPORT Q_DECL_EXPORT
# define Q_NETWORK_EXPORT Q_DECL_EXPORT
# define Q_SVG_EXPORT Q_DECL_EXPORT
@@ -1409,6 +1408,8 @@ class QDataStream;
# else
# define Q_CORE_EXPORT
# define Q_GUI_EXPORT
+# define Q_WIDGETS_EXPORT
+# define Q_PRINTSUPPORT_EXPORT
# define Q_SQL_EXPORT
# define Q_NETWORK_EXPORT
# define Q_SVG_EXPORT
@@ -1439,6 +1440,16 @@ class QDataStream;
# else
# define Q_GUI_EXPORT_INLINE inline
# endif
+# if defined(QT_BUILD_WIDGETS_LIB)
+# define Q_WIDGETS_EXPORT_INLINE Q_WIDGETS_EXPORT inline
+# else
+# define Q_WIDGETS_EXPORT_INLINE inline
+# endif
+# if defined(QT_BUILD_PRINTSUPPORT_LIB)
+# define Q_PRINTSUPPORT_EXPORT_INLINE Q_PRINTSUPPORT_EXPORT inline
+# else
+# define Q_PRINTSUPPORT_EXPORT_INLINE inline
+# endif
# if defined(QT_BUILD_COMPAT_LIB)
# define Q_COMPAT_EXPORT_INLINE Q_COMPAT_EXPORT inline
# else
@@ -1450,10 +1461,14 @@ class QDataStream;
// note: this affects the contents of the DEF files (ie. these functions do not appear)
# define Q_CORE_EXPORT_INLINE inline
# define Q_GUI_EXPORT_INLINE inline
+# define Q_WIDGETS_EXPORT_INLINE inline
+# define Q_PRINTSUPPORT_EXPORT_INLINE inline
# define Q_COMPAT_EXPORT_INLINE inline
#else
# define Q_CORE_EXPORT_INLINE Q_CORE_EXPORT inline
# define Q_GUI_EXPORT_INLINE Q_GUI_EXPORT inline
+# define Q_WIDGETS_EXPORT_INLINE Q_WIDGETS_EXPORT inline
+# define Q_PRINTSUPPORT_EXPORT_INLINE Q_PRINTSUPPORT_EXPORT inline
# define Q_COMPAT_EXPORT_INLINE Q_COMPAT_EXPORT inline
#endif
@@ -1537,7 +1552,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,
@@ -2023,6 +2038,7 @@ static inline bool qIsNull(float f)
return false; \
}
#else
+
# define Q_DUMMY_COMPARISON_OPERATOR(C)
#endif
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 9253b19e60..2fc82c55ca 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -237,13 +237,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 = 0x00000012,
WindowType_Mask = 0x000000ff,
MSWindowsFixedSizeDialogHint = 0x00000100,
@@ -258,13 +258,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,
@@ -1246,7 +1240,8 @@ public:
ImSurroundingText,
ImCurrentSelection,
ImMaximumTextLength,
- ImAnchorPosition
+ ImAnchorPosition,
+ ImHints
};
enum InputMethodHint {
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_
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 14:42:48 +0000