diff options
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 14 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.h | 2 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 7 |
3 files changed, 15 insertions, 8 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 2bd87626c2..7e4e09c6c7 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1183,13 +1183,13 @@ bool qSharedBuild() Q_DECL_NOTHROW QSysInfo::MacintoshVersion variable gives the version of the system on which the application is run. - \value MV_9 Mac OS 9 (unsupported) - \value MV_10_0 Mac OS X 10.0 (unsupported) - \value MV_10_1 Mac OS X 10.1 (unsupported) - \value MV_10_2 Mac OS X 10.2 (unsupported) - \value MV_10_3 Mac OS X 10.3 (unsupported) - \value MV_10_4 Mac OS X 10.4 (unsupported) - \value MV_10_5 Mac OS X 10.5 (unsupported) + \value MV_9 Mac OS 9 + \value MV_10_0 Mac OS X 10.0 + \value MV_10_1 Mac OS X 10.1 + \value MV_10_2 Mac OS X 10.2 + \value MV_10_3 Mac OS X 10.3 + \value MV_10_4 Mac OS X 10.4 + \value MV_10_5 Mac OS X 10.5 \value MV_10_6 Mac OS X 10.6 \value MV_10_7 Mac OS X 10.7 \value MV_10_8 OS X 10.8 diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 268f555c25..c8699c15fe 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1339,7 +1339,7 @@ public: ImPlatformData = 0x80000000, ImQueryInput = ImCursorRectangle | ImCursorPosition | ImSurroundingText | - ImCurrentSelection | ImAnchorPosition, + ImCurrentSelection | ImAnchorRectangle | ImAnchorPosition, ImQueryAll = 0xffffffff }; Q_DECLARE_FLAGS(InputMethodQueries, InputMethodQuery) diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index f028cff6e4..13e2b55e2a 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -234,6 +234,11 @@ set to true won't use the native dialogs provided by the platform. This value has been added in Qt 5.7. + \value AA_SynthesizeMouseForUnhandledTabletEvents All tablet events + that are not accepted by the application will be translated + to mouse events instead. This attribute is enabled + by default. This value has been added in Qt 5.7. + \value AA_DontCheckOpenGLContextThreadAffinity When making a context current using QOpenGLContext, do not check that the \l{QObject#Thread Affinity}{QObject thread affinity} @@ -2575,6 +2580,8 @@ \value ImTextAfterCursor The plain text after the cursor. The widget can decide how much text to return, but \b{must} not return an empty string unless the cursor is at the end of the document. \value ImEnterKeyType The Enter key type. + \value ImAnchorRectangle The bounding rectangle of the selection anchor. + This value has been added in Qt 5.7. Masks: |