Merge master into api_changes

Conflicts:
	src/corelib/kernel/qmetatype.cpp
	src/gui/kernel/qplatformsurface_qpa.cpp
	tests/auto/corelib/tools/qtimeline/qtimeline.pro

Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178

1 files changed, 6 insertions, 0 deletions

diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 367cee70e3..78b6f6f722 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -63,6 +63,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QWindow
+    \since 5.0
     \brief The QWindow class represents a window in the underlying windowing system.
 
     A window that is supplied a parent becomes a native child window of
@@ -597,6 +598,11 @@ bool QWindow::isActive() const
         return false;
 
     QWindow *focus = QGuiApplication::focusWindow();
+
+    // Means the whole application lost the focus
+    if (!focus)
+        return false;
+
     if (focus == this)
         return true;