diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-12-03 00:28:51 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-12-03 00:28:51 (GMT) |
commit | 4a68ca535074625d8ec20435e21fa658652e7680 (patch) | |
tree | 8348012dcb11375d809b1950c2c27e684bdee89b /src/declarative/qml/qmlworkerscript.cpp | |
parent | 2b86b3074ca3473e309bfe4a6975f96020322f08 (diff) | |
parent | 5e7a6806f32b9ff922325a9cad9b2b2405747b0b (diff) | |
download | Qt-4a68ca535074625d8ec20435e21fa658652e7680.zip Qt-4a68ca535074625d8ec20435e21fa658652e7680.tar.gz Qt-4a68ca535074625d8ec20435e21fa658652e7680.tar.bz2 |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlworkerscript.cpp')
-rw-r--r-- | src/declarative/qml/qmlworkerscript.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlworkerscript.cpp b/src/declarative/qml/qmlworkerscript.cpp index a41d9c5..0437bd6 100644 --- a/src/declarative/qml/qmlworkerscript.cpp +++ b/src/declarative/qml/qmlworkerscript.cpp @@ -39,12 +39,12 @@ ** ****************************************************************************/ -#include "qmlworkerscript_p.h" +#include <private/qmlworkerscript_p.h> #include <QtCore/qcoreevent.h> #include <QtCore/qcoreapplication.h> #include <QtCore/qdebug.h> #include <QtScript/qscriptengine.h> -#include "qmlengine_p.h" +#include <private/qmlengine_p.h> #include <QtCore/qmutex.h> #include <QtCore/qwaitcondition.h> #include <QtScript/qscriptvalueiterator.h> |