feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlPuppet: Remove private dependencies from NodeInstanceServer

Browse Source 
Change-Id: I386bd18704020d0b174cda224c4cf46245227877
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-05-19 15:04:36 +02:00
committed by Thomas Hartmann
parent ae28d84efd
commit afd903c4a4
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
View File

@@ -80,9 +80,9 @@
#include <QQmlContext> #include <QQmlContext>
#include <qqmllist.h> #include <qqmllist.h>
#include <QAbstractAnimation> #include <QAbstractAnimation>
#include <private/qabstractanimation_p.h>
#include <QMutableVectorIterator> #include <QMutableVectorIterator>
#include <private/qquickview_p.h> #include <QQuickView>
#include <designersupport.h> #include <designersupport.h>
@@ -256,8 +256,8 @@ void NodeInstanceServer::stopRenderTimer()
void NodeInstanceServer::createScene(const CreateSceneCommand &command) void NodeInstanceServer::createScene(const CreateSceneCommand &command)
{ {
initializeView(); initializeView();
QUnifiedTimer::instance()->setSlowdownFactor(0.00001);
QUnifiedTimer::instance()->setSlowModeEnabled(true); Internal::QmlPrivateGate::stopUnifiedTimer();
setupScene(command); setupScene(command);
refreshBindings(); refreshBindings();

7
share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp
View File

@@ -40,6 +40,7 @@
#include <QQmlComponent> #include <QQmlComponent>
#include <QFileInfo> #include <QFileInfo>
#include <private/qabstractanimation_p.h>
#include <private/qobject_p.h> #include <private/qobject_p.h>
#include <private/qqmltimer_p.h> #include <private/qqmltimer_p.h>
#include <private/qquickanimation_p.h> #include <private/qquickanimation_p.h>
@@ -572,6 +573,12 @@ void disableBehaivour(QObject *object)
behavior->setEnabled(false); behavior->setEnabled(false);
} }
void stopUnifiedTimer()
{
QUnifiedTimer::instance()->setSlowdownFactor(0.00001);
QUnifiedTimer::instance()->setSlowModeEnabled(true);
}
ComponentCompleteDisabler::ComponentCompleteDisabler() ComponentCompleteDisabler::ComponentCompleteDisabler()
{ {
DesignerSupport::disableComponentComplete(); DesignerSupport::disableComponentComplete();

1
share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h
View File

@@ -98,6 +98,7 @@ public:
void disableTextCursor(QQuickItem *item); void disableTextCursor(QQuickItem *item);
void disableTransition(QObject *object); void disableTransition(QObject *object);
void disableBehaivour(QObject *object); void disableBehaivour(QObject *object);
void stopUnifiedTimer();
} // namespace QmlPrivateGate } // namespace QmlPrivateGate
} // namespace Internal } // namespace Internal