diff options
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 5 | ||||
| -rw-r--r-- | src/corelib/global/qlogging.h | 4 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.h | 2 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 9 |
4 files changed, 17 insertions, 3 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index abd9f4f593..3006c75794 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -3130,11 +3130,14 @@ int qEnvironmentVariableIntValue(const char *varName, bool *ok) Q_DECL_NOEXCEPT return 0; } #endif - const qlonglong value = qstrtoll(buffer, Q_NULLPTR, 0, ok); + bool ok_ = true; + const qlonglong value = qstrtoll(buffer, Q_NULLPTR, 0, &ok_); if (int(value) != value) { // this is the check in QByteArray::toInt(), keep it in sync if (ok) *ok = false; return 0; + } else if (ok) { + *ok = ok_; } return int(value); } diff --git a/src/corelib/global/qlogging.h b/src/corelib/global/qlogging.h index b1f69b66b9..679afddb20 100644 --- a/src/corelib/global/qlogging.h +++ b/src/corelib/global/qlogging.h @@ -143,9 +143,9 @@ private: #define QT_MESSAGELOG_LINE __LINE__ #define QT_MESSAGELOG_FUNC Q_FUNC_INFO #else - #define QT_MESSAGELOG_FILE 0 + #define QT_MESSAGELOG_FILE Q_NULLPTR #define QT_MESSAGELOG_LINE 0 - #define QT_MESSAGELOG_FUNC 0 + #define QT_MESSAGELOG_FUNC Q_NULLPTR #endif #define qDebug QMessageLogger(QT_MESSAGELOG_FILE, QT_MESSAGELOG_LINE, QT_MESSAGELOG_FUNC).debug diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 420b8b0430..745fb442f2 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -287,6 +287,7 @@ public: WindowTransparentForInput = 0x00080000, WindowOverridesSystemGestures = 0x00100000, WindowDoesNotAcceptFocus = 0x00200000, + MaximizeUsingFullscreenGeometryHint = 0x00400000, CustomizeWindowHint = 0x02000000, WindowStaysOnBottomHint = 0x04000000, @@ -1695,6 +1696,7 @@ public: QT_Q_ENUM(TimerType) QT_Q_ENUM(ScrollPhase) QT_Q_ENUM(MouseEventSource) + QT_Q_FLAG(MouseEventFlag) QT_Q_ENUM(TabFocusBehavior) #endif // Q_DOC diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index ba3a621751..669bc7a17a 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -2159,6 +2159,15 @@ \value WindowDoesNotAcceptFocus Informs the window system that this window should not receive the input focus. + \value MaximizeUsingFullscreenGeometryHint Informs the window system that when + maximizing the window it should use as much of the available screen geometry + as possible, including areas that may be covered by system UI such as status + bars or application launchers. This may result in the window being placed + under these system UIs, but does not guarantee it, depending on whether or + not the platform supports it. When the flag is enabled the user is responsible + for taking QScreen::availableGeometry() into account, so that any UI elements + in the application that require user interaction are not covered by system UI. + \value WindowType_Mask A mask for extracting the window type part of the window flags. |