aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick')
-rw-r--r--src/quick/designer/designersupport.cpp7
-rw-r--r--src/quick/designer/designersupport.h1
-rw-r--r--src/quick/util/qquickbehavior.cpp2
3 files changed, 9 insertions, 1 deletions
diff --git a/src/quick/designer/designersupport.cpp b/src/quick/designer/designersupport.cpp
index 1b0fea9190..1e67303abf 100644
--- a/src/quick/designer/designersupport.cpp
+++ b/src/quick/designer/designersupport.cpp
@@ -44,11 +44,13 @@
#include <QtQuick/private/qquickshadereffectsource_p.h>
#include <QtQuick/private/qquickrectangle_p.h>
+#include <QtQml/private/qabstractanimationjob_p.h>
#include <private/qqmlengine_p.h>
#include <private/qquickview_p.h>
#include <private/qquickwindowmanager_p.h>
#include <QtQuick/private/qquickstategroup_p.h>
#include <QtGui/QImage>
+#include <private/qqmlvme_p.h>
#include "designerwindowmanager_p.h"
@@ -429,6 +431,11 @@ void DesignerSupport::activateDesignerWindowManager()
QQuickWindowManager::setInstance(new DesignerWindowManager);
}
+void DesignerSupport::activateDesignerMode()
+{
+ QQmlEnginePrivate::activateDesignerMode();
+}
+
void DesignerSupport::createOpenGLContext(QQuickWindow *window)
{
DesignerWindowManager::createOpenGLContext(window);
diff --git a/src/quick/designer/designersupport.h b/src/quick/designer/designersupport.h
index 723e1067d8..b0dbe18ab1 100644
--- a/src/quick/designer/designersupport.h
+++ b/src/quick/designer/designersupport.h
@@ -145,6 +145,7 @@ public:
static void updateDirtyNode(QQuickItem *item);
static void activateDesignerWindowManager();
+ static void activateDesignerMode();
static void createOpenGLContext(QQuickWindow *window);
diff --git a/src/quick/util/qquickbehavior.cpp b/src/quick/util/qquickbehavior.cpp
index 4ea11c46b4..9f9ea67992 100644
--- a/src/quick/util/qquickbehavior.cpp
+++ b/src/quick/util/qquickbehavior.cpp
@@ -175,7 +175,7 @@ void QQuickBehavior::setEnabled(bool enabled)
void QQuickBehavior::write(const QVariant &value)
{
Q_D(QQuickBehavior);
- bool bypass = !d->enabled || !d->finalized;
+ bool bypass = !d->enabled || !d->finalized || QQmlEnginePrivate::designerMode();
if (!bypass)
qmlExecuteDeferred(this);
if (!d->animation || bypass) {