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/qmlbasicscript.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/qmlbasicscript.cpp')
| -rw-r--r-- | src/declarative/qml/qmlbasicscript.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/declarative/qml/qmlbasicscript.cpp b/src/declarative/qml/qmlbasicscript.cpp index 01cb97f..6a32df7 100644 --- a/src/declarative/qml/qmlbasicscript.cpp +++ b/src/declarative/qml/qmlbasicscript.cpp @@ -39,17 +39,20 @@ ** ****************************************************************************/ -#include <private/qmlbasicscript_p.h> +#include "qmlbasicscript_p.h" + +#include "qmlengine_p.h" +#include "qmlcontext_p.h" +#include "qmlrefcount_p.h" +#include "qmlglobal_p.h" + +#include <qfxperf_p_p.h> +#include <qmljsast_p.h> +#include <qmljsengine_p.h> + #include <QColor> #include <QDebug> -#include <private/qmlengine_p.h> -#include <private/qmlcontext_p.h> #include <QStack> -#include <private/qfxperf_p_p.h> -#include <private/qmlrefcount_p.h> -#include <private/qmljsast_p.h> -#include <private/qmljsengine_p.h> -#include <private/qmlglobal_p.h> QT_BEGIN_NAMESPACE |