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/qmlobjectscriptclass.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/qmlobjectscriptclass.cpp')
-rw-r--r-- | src/declarative/qml/qmlobjectscriptclass.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp index f78a12a..7c4ce5b 100644 --- a/src/declarative/qml/qmlobjectscriptclass.cpp +++ b/src/declarative/qml/qmlobjectscriptclass.cpp @@ -40,12 +40,12 @@ ****************************************************************************/ #include "qmlobjectscriptclass_p.h" -#include <private/qmlengine_p.h> +#include "qmlengine_p.h" #include <private/qguard_p.h> -#include <private/qmlcontext_p.h> -#include <private/qmldeclarativedata_p.h> -#include <private/qmltypenamescriptclass_p.h> -#include <private/qmllistscriptclass_p.h> +#include "qmlcontext_p.h" +#include "qmldeclarativedata_p.h" +#include "qmltypenamescriptclass_p.h" +#include "qmllistscriptclass_p.h" #include <qmlbinding.h> #include <QtCore/qtimer.h> |