diff options
author | Martin Jones <martin.jones@nokia.com> | 2009-12-02 08:54:43 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2009-12-02 08:54:43 (GMT) |
commit | 5247ee562f76a51b8a81735d7da709d1b9b63796 (patch) | |
tree | bbe2b7e2b538082ee158ccef7e8f7d1020798e47 /src/declarative/qml/qmlvmemetaobject.cpp | |
parent | bd22fbc0447faa58f3a4ab52ed5545f12a47cd5c (diff) | |
parent | b1ca4dbd2935cb2647aa1650a5185cb918ecb21d (diff) | |
download | Qt-5247ee562f76a51b8a81735d7da709d1b9b63796.zip Qt-5247ee562f76a51b8a81735d7da709d1b9b63796.tar.gz Qt-5247ee562f76a51b8a81735d7da709d1b9b63796.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlvmemetaobject.cpp')
-rw-r--r-- | src/declarative/qml/qmlvmemetaobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlvmemetaobject.cpp b/src/declarative/qml/qmlvmemetaobject.cpp index 3f5dd475..b7ee316 100644 --- a/src/declarative/qml/qmlvmemetaobject.cpp +++ b/src/declarative/qml/qmlvmemetaobject.cpp @@ -41,13 +41,13 @@ #include "qmlvmemetaobject_p.h" #include <qml.h> -#include <private/qmlrefcount_p.h> +#include "qmlrefcount_p.h" #include <QColor> #include <QDate> #include <QtCore/qlist.h> #include <QtCore/qdebug.h> #include <qmlexpression.h> -#include <private/qmlcontext_p.h> +#include "qmlcontext_p.h" QT_BEGIN_NAMESPACE |