summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlbasicscript.cpp
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-12-03 22:59:58 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-12-03 22:59:58 (GMT)
commit436b0fff9d9ba95c0fe582f3b71d15d5a9a8535f (patch)
tree9fa98ed5eea2a806ef4e949f8d95a0f25e6c4be1 /src/declarative/qml/qmlbasicscript.cpp
parent5ec35c0756464ec512de0961c2ae41bec39ac2f7 (diff)
parent4621061e8c32e234a0d7688e226e92d87172f99b (diff)
downloadQt-436b0fff9d9ba95c0fe582f3b71d15d5a9a8535f.zip
Qt-436b0fff9d9ba95c0fe582f3b71d15d5a9a8535f.tar.gz
Qt-436b0fff9d9ba95c0fe582f3b71d15d5a9a8535f.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.cpp19
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