diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-31 08:55:16 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-31 08:55:16 +0200 |
commit | 71478352376022faa9be6d79f2a760c289945ff5 (patch) | |
tree | 0f8ff4a88c1b033367337a93d23a329d145ee903 /src/plugins | |
parent | c38efcb67cf93ba3e91e184c3b891efef4ef75a3 (diff) | |
parent | 05daa9bfe1a03ffe1cc580b6cfd88e093e2493c0 (diff) |
Merge branch 'master' into refactor
Conflicts:
src/3rdparty/v8
src/declarative/declarative.pro
src/declarative/items/qsgcanvas.cpp
src/declarative/items/qsgshadereffectsource_p.h
src/declarative/items/qsgview.cpp
src/declarative/particles/qsgcustomparticle.cpp
src/imports/gestures/gestures.pro
src/imports/particles/particles.pro
src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
src/qtquick1/qtquick1.pro
tests/auto/declarative/examples/examples.pro
tests/auto/declarative/qsglistview/qsglistview.pro
tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro
Change-Id: I423344f83e1835116cad531b877fde6e68a8849a
Diffstat (limited to 'src/plugins')
3 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp index 3cb35e5738..8dcc076630 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp @@ -47,7 +47,7 @@ #include <QtDeclarative/QDeclarativeEngine> #include <QtDeclarative/QDeclarativeComponent> -#include <QtDeclarative/private/qdeclarativedebughelper_p.h> +#include <QtCore/private/qabstractanimation_p.h> #include "QtDeclarative/private/qdeclarativeinspectorservice_p.h" #include <QtWidgets/QVBoxLayout> @@ -180,7 +180,8 @@ void AbstractViewInspector::animationSpeedChangeRequested(qreal factor) } const float effectiveFactor = m_animationPaused ? 0 : factor; - QDeclarativeDebugHelper::setAnimationSlowDownFactor(effectiveFactor); + QUnifiedTimer::instance()->setSlowModeEnabled(effectiveFactor != 1.0); + QUnifiedTimer::instance()->setSlowdownFactor(effectiveFactor); } void AbstractViewInspector::animationPausedChangeRequested(bool paused) @@ -191,7 +192,8 @@ void AbstractViewInspector::animationPausedChangeRequested(bool paused) } const float effectiveFactor = paused ? 0 : m_slowDownFactor; - QDeclarativeDebugHelper::setAnimationSlowDownFactor(effectiveFactor); + QUnifiedTimer::instance()->setSlowModeEnabled(effectiveFactor != 1.0); + QUnifiedTimer::instance()->setSlowdownFactor(effectiveFactor); } void AbstractViewInspector::setShowAppOnTop(bool appOnTop) diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro index d547422cb0..c165832013 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro +++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro @@ -1,7 +1,7 @@ load(qt_module) TARGET = qmldbg_inspector -QT += declarative-private core-private gui-private opengl-private qtquick1 widgets widgets-private +QT += declarative-private core-private gui-private opengl-private qtquick1 widgets widgets-private v8-private load(qt_plugin) diff --git a/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp index bb9ad52fee..497e51db4d 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp @@ -46,7 +46,6 @@ #include "sgselectiontool.h" #include <QtDeclarative/private/qdeclarativeinspectorservice_p.h> -#include <QtDeclarative/private/qdeclarativedebughelper_p.h> #include <QtDeclarative/private/qsgitem_p.h> #include <QtDeclarative/QSGView> |