Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  QmlViewer: Remove unused class variables
  Fixed bug and performance problem in windowsstyle.
  Restored old flushing behavior in -graphicssystem opengl on desktop.
  Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs
  Designer: Block QEvent::WinIdChange.
  QUrl::setUrl should call detach
  qkeymapper_x11.cpp: fix compilation with LSB and without XKB

2 files changed, 1 insertions, 2 deletions

diff --git a/tools/designer/src/components/formeditor/formwindowmanager.cpp b/tools/designer/src/components/formeditor/formwindowmanager.cpp
index ce809ff..ed854cf 100644
--- a/tools/designer/src/components/formeditor/formwindowmanager.cpp
+++ b/tools/designer/src/components/formeditor/formwindowmanager.cpp
@@ -192,6 +192,7 @@ bool FormWindowManager::eventFilter(QObject *o, QEvent *e)
     case QEvent::ToolTip:
     case QEvent::WhatsThis:
     case QEvent::WhatsThisClicked:
+    case QEvent::WinIdChange:
     case QEvent::DynamicPropertyChange:
     case QEvent::HoverEnter:
     case QEvent::HoverLeave:
diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h
index b43aa54..a70ffc9 100644
--- a/tools/qml/qmlruntime.h
+++ b/tools/qml/qmlruntime.h
@@ -188,8 +188,6 @@ private:
     ScriptOptions m_scriptOptions;
     QDeclarativeTester *tester;
 
-    QNetworkReply *wgtreply;
-    QString wgtdir;
     NetworkAccessManagerFactory *namFactory;
 
     bool useQmlFileBrowser;