summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-20 13:24:42 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-20 13:24:42 (GMT)
commite1ffbc04131dc6f76fa76821c297d08162e4b1ee (patch)
tree3759931edbad1f7dfbcdc11dc05cb0c161cf1073 /src/plugins
parent55b84a03e33b87e44b2e65ed1c02f93aa553c323 (diff)
parent5184d55d434296710041812976656ed6825447ec (diff)
downloadQt-e1ffbc04131dc6f76fa76821c297d08162e4b1ee.zip
Qt-e1ffbc04131dc6f76fa76821c297d08162e4b1ee.tar.gz
Qt-e1ffbc04131dc6f76fa76821c297d08162e4b1ee.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QDeclarativeDebug: Fix endless loop for property with SCRITABLE false Fix Symbian/Linux compilation breakage in plugins/qmltooling Make QMLViewer startup animation stop after a while Fix excessive scrolling in TextInput with mid string pre-edit text.
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/qmltooling/qmldbg_ost/qostdevice.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmltooling/qmldbg_ost/qostdevice.h b/src/plugins/qmltooling/qmldbg_ost/qostdevice.h
index ba1f443..2c26ff7 100644
--- a/src/plugins/qmltooling/qmldbg_ost/qostdevice.h
+++ b/src/plugins/qmltooling/qmldbg_ost/qostdevice.h
@@ -42,7 +42,7 @@
#ifndef QOSTDEVICE_H
#define QOSTDEVICE_H
-#include <QIODevice.h>
+#include <QtCore/QIODevice>
QT_BEGIN_NAMESPACE