summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmlview.cpp
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-11-13 03:37:23 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-11-13 03:37:23 (GMT)
commita5563a8636b871def972f20083b11247caa6cb5a (patch)
tree032995af4d5182a521648dd7673216aec01ed1ae /src/declarative/util/qmlview.cpp
parentcd2187091e6b357c79f4e0db0a14f210df79f3fd (diff)
parent9e6960ed4ce172c61895b81aaaf541415e08dafd (diff)
downloadQt-a5563a8636b871def972f20083b11247caa6cb5a.zip
Qt-a5563a8636b871def972f20083b11247caa6cb5a.tar.gz
Qt-a5563a8636b871def972f20083b11247caa6cb5a.tar.bz2
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmlview.cpp')
-rw-r--r--src/declarative/util/qmlview.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qmlview.cpp b/src/declarative/util/qmlview.cpp
index a55a57a..63115bb 100644
--- a/src/declarative/util/qmlview.cpp
+++ b/src/declarative/util/qmlview.cpp
@@ -57,8 +57,8 @@
#include "private/qfxperf_p_p.h"
#include "qmlview.h"
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcontext.h>
+#include <qmlengine.h>
+#include <qmlcontext.h>
#include <private/qmldebug_p.h>
#include <private/qmldebugservice_p.h>
#include <QtCore/qabstractanimation.h>