diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-12-04 01:15:57 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-12-04 01:15:57 (GMT) |
| commit | b664d980f4c3b6fb379d68e54b6087b83a4c26b0 (patch) | |
| tree | 533405c49bc96482f9fe2bdab87d22ffe2395901 /src/declarative/qml/qmlexpression.cpp | |
| parent | cbd5c58e017757126b3c4bcafde7416444f6b8c0 (diff) | |
| parent | 6b35bde56028997a9a676f5135f0525575937dba (diff) | |
| download | Qt-b664d980f4c3b6fb379d68e54b6087b83a4c26b0.zip Qt-b664d980f4c3b6fb379d68e54b6087b83a4c26b0.tar.gz Qt-b664d980f4c3b6fb379d68e54b6087b83a4c26b0.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlexpression.cpp')
| -rw-r--r-- | src/declarative/qml/qmlexpression.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/declarative/qml/qmlexpression.cpp b/src/declarative/qml/qmlexpression.cpp index 276b118..ab9f9ea 100644 --- a/src/declarative/qml/qmlexpression.cpp +++ b/src/declarative/qml/qmlexpression.cpp @@ -40,13 +40,16 @@ ****************************************************************************/ #include "qmlexpression.h" -#include <private/qmlexpression_p.h> -#include <private/qmlengine_p.h> -#include <private/qmlcontext_p.h> -#include <private/qmlrewrite_p.h> -#include "QtCore/qdebug.h" -#include <private/qmlcompiler_p.h> +#include "qmlexpression_p.h" + +#include "qmlengine_p.h" +#include "qmlcontext_p.h" +#include "qmlrewrite_p.h" +#include "qmlcompiler_p.h" + +#include <QtCore/qdebug.h> #include <QtScript/qscriptprogram.h> + #include <private/qscriptdeclarativeclass_p.h> Q_DECLARE_METATYPE(QList<QObject *>); |