diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-09 07:10:11 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-09 07:10:11 (GMT) |
| commit | 5b56189c9a6c322fa595b716a9f17e39a35bcbc0 (patch) | |
| tree | 2e8b4fc397d631207aa32a8c68c94100a54f0f61 /src/declarative/qml/qmlcontext.cpp | |
| parent | 888f57107e698731c4a1dd2c46745c6293b2222e (diff) | |
| parent | 7343bbb230161d563b0226011e4519f695fdc593 (diff) | |
| download | Qt-5b56189c9a6c322fa595b716a9f17e39a35bcbc0.zip Qt-5b56189c9a6c322fa595b716a9f17e39a35bcbc0.tar.gz Qt-5b56189c9a6c322fa595b716a9f17e39a35bcbc0.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlengine.cpp
Diffstat (limited to 'src/declarative/qml/qmlcontext.cpp')
| -rw-r--r-- | src/declarative/qml/qmlcontext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp index 60cb231..e97d2e9 100644 --- a/src/declarative/qml/qmlcontext.cpp +++ b/src/declarative/qml/qmlcontext.cpp @@ -41,12 +41,12 @@ #include <qmlcontext.h> #include <private/qmlcontext_p.h> +#include <private/qmlexpression_p.h> #include <private/qmlengine_p.h> #include <qmlengine.h> #include <qscriptengine.h> #include <QtCore/qvarlengtharray.h> - -#include <qdebug.h> +#include <QtCore/qdebug.h> // 6-bits #define MAXIMUM_DEFAULT_OBJECTS 63 |