summaryrefslogtreecommitdiffstats
path: root/tools/qmlviewer/deviceorientation.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-17 06:58:40 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-17 06:58:40 (GMT)
commitf5668a63a9396b8f21a62a3a780f1e0023715806 (patch)
tree88cad63bd0dfea70bcf54e3eed57b8a11189fd29 /tools/qmlviewer/deviceorientation.h
parentfd3f9dd0f31efeea3aa0ec28b54c70d85712c7ba (diff)
parent060d833d3e0fd5a99876e0717fb26ef93fae30e1 (diff)
downloadQt-f5668a63a9396b8f21a62a3a780f1e0023715806.zip
Qt-f5668a63a9396b8f21a62a3a780f1e0023715806.tar.gz
Qt-f5668a63a9396b8f21a62a3a780f1e0023715806.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (47 commits) Add missing NOTIFY signals to various QML item class properties Fix currentIndex after itemsMoved() qmlviewer: build on symbian Revert "Replace QList<>* support with QmlListProperty" Declare QmlXmlListModelRole meta type before any code uses it. Make compile on Symbian (call Q_DECLARE_METATYPE earlier) Conditionally link webkit on wince Revert "Run dos2unix on these files." Expose LayoutItem documentation Fix palette on the N900 Fix QTBUG-8090, improve original patch effectiveness. Replace QList<>* support with QmlListProperty Run dos2unix on these files. Remove standalone QmlDebugger. It is now only available through the Mobility 404 Fix crash in QmlMetaProperty that could occur when using value-type QML binding optimizer crash QML binding optimizer crash Fix crash in QML binding optimizer Don't delete binding directly ...
Diffstat (limited to 'tools/qmlviewer/deviceorientation.h')
-rw-r--r--tools/qmlviewer/deviceorientation.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/qmlviewer/deviceorientation.h b/tools/qmlviewer/deviceorientation.h
index fa7758f..efd45b3 100644
--- a/tools/qmlviewer/deviceorientation.h
+++ b/tools/qmlviewer/deviceorientation.h
@@ -44,6 +44,8 @@
#include <QObject>
+QT_BEGIN_NAMESPACE
+
class DeviceOrientationPrivate;
class DeviceOrientation : public QObject
{
@@ -66,4 +68,6 @@ private:
friend class DeviceOrientationPrivate;
};
+QT_END_NAMESPACE
+
#endif