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/qmlcomponent.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/qmlcomponent.cpp')
| -rw-r--r-- | src/declarative/qml/qmlcomponent.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index 85da2c1..2e8e4ce 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -42,21 +42,21 @@ #include "qmlcomponent.h" #include "qmlcomponent_p.h" #include "qmlcompiler_p.h" -#include "private/qmlcontext_p.h" -#include "private/qmlcompositetypedata_p.h" -#include "private/qmlengine_p.h" +#include "qmlcontext_p.h" +#include "qmlcompositetypedata_p.h" +#include "qmlengine_p.h" #include "qmlvme_p.h" #include "qml.h" #include <QStack> -#include <private/qfxperf_p_p.h> +#include "qfxperf_p_p.h" #include <QStringList> #include <qmlengine.h> #include <QFileInfo> #include "qmlbinding.h" #include <QtCore/qdebug.h> #include <QApplication> -#include <private/qmlbinding_p.h> -#include <private/qmlglobal_p.h> +#include "qmlbinding_p.h" +#include "qmlglobal_p.h" #include "qmlscriptparser_p.h" |