diff options
| author | Charles Yin <charles.yin@nokia.com> | 2011-10-21 15:26:16 +1000 |
|---|---|---|
| committer | Charles Yin <charles.yin@nokia.com> | 2011-10-21 16:04:04 +1000 |
| commit | a4100aa65f3d7963198584aec21eb4f67f646fe0 (patch) | |
| tree | e1dabd1f72f2a6de102b8187b7ef391686d61397 /src/declarative/debugger/qdeclarativedebughelper.cpp | |
| parent | 6574543e74e6eca1c3e76f5dcd5f47bfb33e9bdd (diff) | |
| parent | 2bf7113a0ddfe4490cf9df1780a72c36ae282f8c (diff) | |
Merge branch 'master' into animation-refactor
Conflicts:
src/declarative/debugger/qdeclarativedebughelper.cpp
src/declarative/items/qsgcanvas.cpp
src/declarative/particles/qsgparticlesystem.cpp
src/declarative/particles/qsgparticlesystem_p.h
src/declarative/scenegraph/qsgcontext_p.h
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativeanimation_p.h
src/declarative/util/qdeclarativebehavior.cpp
src/declarative/util/qdeclarativesmoothedanimation.cpp
src/declarative/util/qdeclarativesmoothedanimation_p_p.h
tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro
Change-Id: I74c51cb6f7b6fb2f96b8f107c4a6f7468462cd50
Diffstat (limited to 'src/declarative/debugger/qdeclarativedebughelper.cpp')
| -rw-r--r-- | src/declarative/debugger/qdeclarativedebughelper.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/declarative/debugger/qdeclarativedebughelper.cpp b/src/declarative/debugger/qdeclarativedebughelper.cpp index e6b3563a9a..e9e9387af1 100644 --- a/src/declarative/debugger/qdeclarativedebughelper.cpp +++ b/src/declarative/debugger/qdeclarativedebughelper.cpp @@ -39,7 +39,11 @@ ** ****************************************************************************/ -#include "private/qdeclarativedebughelper_p.h" +#include "qdeclarativedebughelper_p.h" + +#include <QtDeclarative/QJSEngine> + +#include <private/qdeclarativeengine_p.h> #include "private/qabstractanimation2_p.h" #include <private/qdeclarativeengine_p.h> #include <QtDeclarative/QJSEngine> @@ -63,4 +67,4 @@ void QDeclarativeDebugHelper::enableDebugging() { #endif } -QT_END_NAMESPACE +QT_END_NAMESPACE
\ No newline at end of file |