diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-07 16:06:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-07 16:06:12 (GMT) |
| commit | e77f4301e8154212d1410a762e0e0279c5b3069c (patch) | |
| tree | a51768c3763d426567816cc2b9d5b6a59e56990a /tools | |
| parent | 606294044df3cf318bd6bb6f2e73389d84e3a032 (diff) | |
| parent | 2f2837888324b6d75ac1be170790772d1fcf5f17 (diff) | |
| download | Qt-e77f4301e8154212d1410a762e0e0279c5b3069c.zip Qt-e77f4301e8154212d1410a762e0e0279c5b3069c.tar.gz Qt-e77f4301e8154212d1410a762e0e0279c5b3069c.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/designer/src/components/formeditor/formwindowmanager.cpp | 1 | ||||
| -rw-r--r-- | tools/qml/qmlruntime.h | 2 |
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; |