From 2a8189035f3c841d36f84a38f67b6322068025b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Wed, 27 Apr 2011 11:56:35 +0200
Subject: [PATCH] Add isWindow type to QObject (cherry picked from commit
 77f08730b4cdb23b43471b2b29ece59e159103d7)

---
 src/corelib/kernel/qobject.cpp | 1 +
 src/corelib/kernel/qobject.h   | 4 +++-
 src/gui/kernel/qwindow_qpa.cpp | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 357cfd3f335..9f3c63c588b 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -157,6 +157,7 @@ QObjectPrivate::QObjectPrivate(int version)
 #endif
     metaObject = 0;
     hasGuards = false;
+    isWindow = false;
 }
 
 QObjectPrivate::~QObjectPrivate()
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h
index 0ad73f5fe90..be2f5cbf6e4 100644
--- a/src/corelib/kernel/qobject.h
+++ b/src/corelib/kernel/qobject.h
@@ -102,7 +102,8 @@ public:
     uint inEventHandler : 1; //only used if QT_JAMBI_BUILD
     uint inThreadChangeEvent : 1;
     uint hasGuards : 1; //true iff there is one or more QPointer attached to this object
-    uint unused : 22;
+    uint isWindow : 1; //for QWindow
+    uint unused : 21;
     int postedEvents;
     QMetaObject *metaObject; // assert dynamic
 };
@@ -144,6 +145,7 @@ public:
     void setObjectName(const QString &name);
 
     inline bool isWidgetType() const { return d_ptr->isWidget; }
+    inline bool isWindowType() const { return d_ptr->isWindow; }
 
     inline bool signalsBlocked() const { return d_ptr->blockSig; }
     bool blockSignals(bool b);
diff --git a/src/gui/kernel/qwindow_qpa.cpp b/src/gui/kernel/qwindow_qpa.cpp
index d9a73632b72..8e8d3e78fdd 100644
--- a/src/gui/kernel/qwindow_qpa.cpp
+++ b/src/gui/kernel/qwindow_qpa.cpp
@@ -63,7 +63,7 @@ public:
         , glContext(0)
         , widget(0)
     {
-
+        isWindow = true;
     }
 
     ~QWindowPrivate()