diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-12-02 07:58:21 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-12-02 07:58:21 (GMT) |
| commit | f378ee91aecf64e9f9f2105a9831fa7b0ffc9463 (patch) | |
| tree | 241fb1c0efc75df84a7e4b872eac58ecbe5b07a3 /src/declarative/qml/qmldom.cpp | |
| parent | 3a6809a54bee6eba517d7077070c697ecc0b56c3 (diff) | |
| parent | 4c8fdfca8b31916f9a130c163914ded7eb391807 (diff) | |
| download | Qt-f378ee91aecf64e9f9f2105a9831fa7b0ffc9463.zip Qt-f378ee91aecf64e9f9f2105a9831fa7b0ffc9463.tar.gz Qt-f378ee91aecf64e9f9f2105a9831fa7b0ffc9463.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlvme.cpp
Diffstat (limited to 'src/declarative/qml/qmldom.cpp')
| -rw-r--r-- | src/declarative/qml/qmldom.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp index f4a137c..596294f 100644 --- a/src/declarative/qml/qmldom.cpp +++ b/src/declarative/qml/qmldom.cpp @@ -41,14 +41,14 @@ #include "qmldom.h" #include "qmldom_p.h" -#include "private/qmlcompositetypedata_p.h" -#include "private/qmlcompiler_p.h" -#include "private/qmlengine_p.h" +#include "qmlcompositetypedata_p.h" +#include "qmlcompiler_p.h" +#include "qmlengine_p.h" #include <QtCore/QByteArray> #include <QtCore/QDebug> #include <QtCore/QString> #include "qmlscriptparser_p.h" -#include <private/qmlglobal_p.h> +#include "qmlglobal_p.h" QT_BEGIN_NAMESPACE |