summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlcompositetypemanager_p.h
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-11-13 00:44:39 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-11-13 00:44:39 (GMT)
commit3e16a19ba08b68aa92fd1eed5d5455fe02ef073f (patch)
tree277b1644988f9104673121291b9c1cc7e816d35b /src/declarative/qml/qmlcompositetypemanager_p.h
parent652e43ddbc4bf32b8c5f634a47a883f7029fd890 (diff)
parente0a137cd1b138e63804756f897a20bf8178efb84 (diff)
downloadQt-3e16a19ba08b68aa92fd1eed5d5455fe02ef073f.zip
Qt-3e16a19ba08b68aa92fd1eed5d5455fe02ef073f.tar.gz
Qt-3e16a19ba08b68aa92fd1eed5d5455fe02ef073f.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlcompositetypemanager_p.h')
-rw-r--r--src/declarative/qml/qmlcompositetypemanager_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlcompositetypemanager_p.h b/src/declarative/qml/qmlcompositetypemanager_p.h
index af028df..0abbfb5 100644
--- a/src/declarative/qml/qmlcompositetypemanager_p.h
+++ b/src/declarative/qml/qmlcompositetypemanager_p.h
@@ -56,8 +56,8 @@
#include <QtCore/qglobal.h>
#include <private/qmlscriptparser_p.h>
#include <private/qmlrefcount_p.h>
-#include <QtDeclarative/qmlerror.h>
-#include <QtDeclarative/qmlengine.h>
+#include <qmlerror.h>
+#include <qmlengine.h>
QT_BEGIN_NAMESPACE