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/qmlmetaproperty.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/qmlmetaproperty.cpp')
| -rw-r--r-- | src/declarative/qml/qmlmetaproperty.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp index 8bde318..0e34305 100644 --- a/src/declarative/qml/qmlmetaproperty.cpp +++ b/src/declarative/qml/qmlmetaproperty.cpp @@ -43,7 +43,7 @@ #include "qmlmetaproperty_p.h" #include "qmlcompositetypedata_p.h" #include <qml.h> -#include <private/qfxperf_p_p.h> +#include "qfxperf_p_p.h" #include <QStringList> #include "qmlbinding.h" #include <qmlcontext.h> @@ -51,8 +51,8 @@ #include <math.h> #include <QtCore/qdebug.h> #include <qmlengine.h> -#include <private/qmlengine_p.h> -#include <private/qmldeclarativedata_p.h> +#include "qmlengine_p.h" +#include "qmldeclarativedata_p.h" Q_DECLARE_METATYPE(QList<QObject *>); |