Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14

4 files changed, 10 insertions, 10 deletions

diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 3df7802b65..f99f28d6e0 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -3989,7 +3989,7 @@ QWindowStateChangeEvent::~QWindowStateChangeEvent()
     This makes it possible for sibling widgets to handle touch events independently while making
     sure that the sequence of QTouchEvents is always correct.
 
-    \section1 Mouse Events and Touch Event synthesizing
+    \section1 Mouse Events and Touch Event Synthesizing
 
     QTouchEvent delivery is independent from that of QMouseEvent. The application flags
     Qt::AA_SynthesizeTouchForUnhandledMouseEvents and Qt::AA_SynthesizeMouseForUnhandledTouchEvents
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 520330abc1..e7fdbde432 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -1201,7 +1201,7 @@ void QGuiApplicationPrivate::eventDispatcherReady()
 static bool runningUnderDebugger()
 {
     const QFileInfo parentProcExe(QStringLiteral("/proc/") + QString::number(getppid()) + QStringLiteral("/exe"));
-    return parentProcExe.isSymLink() && parentProcExe.symLinkTarget().endsWith(QStringLiteral("/gdb"));
+    return parentProcExe.isSymLink() && parentProcExe.symLinkTarget().endsWith(QLatin1String("/gdb"));
 }
 #endif
 
diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp
index 676309183f..8b2378788f 100644
--- a/src/gui/kernel/qopenglcontext.cpp
+++ b/src/gui/kernel/qopenglcontext.cpp
@@ -297,7 +297,7 @@ QOpenGLContext *qt_gl_global_share_context()
     For an example of how to use QOpenGLContext see the
     \l{OpenGL Window Example}{OpenGL Window} example.
 
-    \section1 Thread affinity
+    \section1 Thread Affinity
 
     QOpenGLContext can be moved to a different thread with moveToThread(). Do
     not call makeCurrent() from a different thread than the one to which the
@@ -305,7 +305,7 @@ QOpenGLContext *qt_gl_global_share_context()
     and against one surface at a time, and a thread only has one context
     current at a time.
 
-    \section1 Context resource sharing
+    \section1 Context Resource Sharing
 
     Resources, such as framebuffer objects, textures, and vertex buffer objects
     can be shared between contexts.  Use setShareContext() before calling
@@ -317,7 +317,7 @@ QOpenGLContext *qt_gl_global_share_context()
     the share group. A non-sharing context has a share group consisting of a
     single context.
 
-    \section1 Default framebuffer
+    \section1 Default Framebuffer
 
     On certain platforms, a framebuffer other than 0 might be the default frame
     buffer depending on the current surface. Instead of calling
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 8dca5c63b6..e23e0f8e57 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -75,14 +75,14 @@ QT_BEGIN_NAMESPACE
     are useful reference examples for how to render to a QWindow using
     either approach.
 
-    \section1 Resource management
+    \section1 Resource Management
 
     Windows can potentially use a lot of memory. A usual measurement is
     width times height times color depth. A window might also include multiple
     buffers to support double and triple buffering, as well as depth and stencil
     buffers. To release a window's memory resources, call the destroy() function.
 
-    \section1 Content orientation
+    \section1 Content Orientation
 
     QWindow has reportContentOrientationChange() that can be used to specify
     the layout of the window contents in relation to the screen. The content
@@ -93,7 +93,7 @@ QT_BEGIN_NAMESPACE
     system might use this value to determine the layout of system popups or
     dialogs.
 
-    \section1 Visibility and Windowing system exposure.
+    \section1 Visibility and Windowing System Exposure
 
     By default, the window is not visible, and you must call setVisible(true),
     or show() or similar to make it visible. To make a window hidden again,
@@ -123,7 +123,7 @@ QT_BEGIN_NAMESPACE
     isExposed() changes, reimplement exposeEvent(). The window will always get
     a resize event before the first expose event.
 
-    \section1 Initial geometry
+    \section1 Initial Geometry
 
     If the window's width and height are left uninitialized, the window will
     get a reasonable default geometry from the platform window. If the position
@@ -1697,7 +1697,7 @@ void QWindow::setScreen(QScreen *newScreen)
 void QWindow::screenDestroyed(QObject *object)
 {
     Q_D(QWindow);
-    if (d->parentWindow)
+    if (d->parentWindow || QGuiApplication::closingDown())
         return;
     if (object == static_cast<QObject *>(d->topLevelScreen)) {
         const bool wasVisible = isVisible();