summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-11-11 07:30:57 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-11-11 07:30:57 (GMT)
commit0faef2ba318b7df095d5c20fdddd0933ae4912c3 (patch)
tree691307757f389a70797e55748494561540e71873 /src
parent0299f2c6b2e6fa05013e1ad3b634a370f0f907e8 (diff)
parent3fa3e8d03109ec566b9f33c85543157467adfeea (diff)
downloadQt-0faef2ba318b7df095d5c20fdddd0933ae4912c3.zip
Qt-0faef2ba318b7df095d5c20fdddd0933ae4912c3.tar.gz
Qt-0faef2ba318b7df095d5c20fdddd0933ae4912c3.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src')
-rw-r--r--src/declarative/util/qmlopenmetaobject_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qmlopenmetaobject_p.h b/src/declarative/util/qmlopenmetaobject_p.h
index 1cf12f8..7a5b4ce 100644
--- a/src/declarative/util/qmlopenmetaobject_p.h
+++ b/src/declarative/util/qmlopenmetaobject_p.h
@@ -43,7 +43,7 @@
#define QMLOPENMETAOBJECT_H
#include <QtCore/QMetaObject>
-#include <QtCore/private/qobject_p.h>
+#include <private/qobject_p.h>
#include <QtCore/QObject>
QT_BEGIN_HEADER