summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qglobal.h2
-rw-r--r--src/corelib/global/qnamespace.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index cc3eab4e42..7800f8c562 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -998,8 +998,6 @@ Q_CORE_EXPORT QString qtTrId(const char *id, int n = -1);
#endif // QT_NO_TRANSLATION
-#define QDOC_PROPERTY(text)
-
/*
When RTTI is not available, define this macro to force any uses of
dynamic_cast to cause a compile failure.
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 1a3536d45b..fc7ca9b216 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -507,6 +507,7 @@ public:
AA_DisableHighDpiScaling = 21,
AA_UseStyleSheetPropagationInWidgetStyles = 22, // ### Qt 6: remove me
AA_DontUseNativeDialogs = 23,
+ AA_SynthesizeMouseForUnhandledTabletEvents = 24,
// Add new attributes before this line
AA_AttributeCount
@@ -1338,6 +1339,7 @@ public:
ImTextBeforeCursor = 0x800,
ImTextAfterCursor = 0x1000,
ImEnterKeyType = 0x2000,
+ ImAnchorRectangle = 0x4000,
ImPlatformData = 0x80000000,
ImQueryInput = ImCursorRectangle | ImCursorPosition | ImSurroundingText |