diff options
Diffstat (limited to 'src/quick/designer')
5 files changed, 16 insertions, 13 deletions
diff --git a/src/quick/designer/qqmldesignermetaobject.cpp b/src/quick/designer/qqmldesignermetaobject.cpp index 2efcdada8b..de7da7f9be 100644 --- a/src/quick/designer/qqmldesignermetaobject.cpp +++ b/src/quick/designer/qqmldesignermetaobject.cpp @@ -45,7 +45,6 @@ #include <QDebug> #include <private/qqmlengine_p.h> -#include <private/qqmlpropertycache_p.h> QT_BEGIN_NAMESPACE @@ -137,7 +136,7 @@ QQmlDesignerMetaObject::QQmlDesignerMetaObject(QObject *object, QQmlEngine *engi //Assign cache to object if (ddata && ddata->propertyCache) { cache->setParent(ddata->propertyCache); - cache->invalidate(engine, this); + cache->invalidate(this); ddata->propertyCache->release(); ddata->propertyCache = cache.data(); ddata->propertyCache->addref(); @@ -162,7 +161,7 @@ void QQmlDesignerMetaObject::createNewDynamicProperty(const QString &name) //Updating cache QQmlPropertyCache *oldParent = cache->parent(); - QQmlEnginePrivate::get(m_context->engine())->cache(this)->invalidate(m_context->engine(), this); + QQmlEnginePrivate::get(m_context->engine())->cache(this)->invalidate(this); cache->setParent(oldParent); QQmlProperty property(myObject(), name, m_context); diff --git a/src/quick/designer/qquickdesignercustomparserobject.cpp b/src/quick/designer/qquickdesignercustomparserobject.cpp index 50a8b6a25b..841aae5bc3 100644 --- a/src/quick/designer/qquickdesignercustomparserobject.cpp +++ b/src/quick/designer/qquickdesignercustomparserobject.cpp @@ -46,12 +46,12 @@ QQuickDesignerCustomParserObject::QQuickDesignerCustomParserObject() } -void QQuickDesignerCustomParser::verifyBindings(const QQmlRefPointer<QV4::CompiledData::CompilationUnit> &, const QList<const QV4::CompiledData::Binding *> &) +void QQuickDesignerCustomParser::verifyBindings(const QQmlRefPointer<QV4::ExecutableCompilationUnit> &, const QList<const QV4::CompiledData::Binding *> &) { /* Nothing to do we accept anything */ } -void QQuickDesignerCustomParser::applyBindings(QObject *, const QQmlRefPointer<QV4::CompiledData::CompilationUnit> &, const QList<const QV4::CompiledData::Binding *> &) +void QQuickDesignerCustomParser::applyBindings(QObject *, const QQmlRefPointer<QV4::ExecutableCompilationUnit> &, const QList<const QV4::CompiledData::Binding *> &) { /* Nothing to do we accept anything */ } diff --git a/src/quick/designer/qquickdesignercustomparserobject_p.h b/src/quick/designer/qquickdesignercustomparserobject_p.h index b38417d102..4da00ea841 100644 --- a/src/quick/designer/qquickdesignercustomparserobject_p.h +++ b/src/quick/designer/qquickdesignercustomparserobject_p.h @@ -70,8 +70,8 @@ public: QQuickDesignerCustomParser() : QQmlCustomParser(AcceptsAttachedProperties | AcceptsSignalHandlers) {} - void verifyBindings(const QQmlRefPointer<QV4::CompiledData::CompilationUnit> &compilationUnit, const QList<const QV4::CompiledData::Binding *> &props) override; - void applyBindings(QObject *obj, const QQmlRefPointer<QV4::CompiledData::CompilationUnit> &compilationUnit, const QList<const QV4::CompiledData::Binding *> &bindings) override; + void verifyBindings(const QQmlRefPointer<QV4::ExecutableCompilationUnit> &compilationUnit, const QList<const QV4::CompiledData::Binding *> &props) override; + void applyBindings(QObject *obj, const QQmlRefPointer<QV4::ExecutableCompilationUnit> &compilationUnit, const QList<const QV4::CompiledData::Binding *> &bindings) override; }; QT_END_NAMESPACE diff --git a/src/quick/designer/qquickdesignerwindowmanager.cpp b/src/quick/designer/qquickdesignerwindowmanager.cpp index 093559a572..9648a40a23 100644 --- a/src/quick/designer/qquickdesignerwindowmanager.cpp +++ b/src/quick/designer/qquickdesignerwindowmanager.cpp @@ -39,10 +39,10 @@ #include "qquickdesignerwindowmanager_p.h" #include "private/qquickwindow_p.h" +#include <QtQuick/QQuickWindow> #if QT_CONFIG(opengl) -# include <QtQuick/private/qsgdefaultrendercontext_p.h> +#include <private/qsgdefaultrendercontext_p.h> #endif -#include <QtQuick/QQuickWindow> QT_BEGIN_NAMESPACE @@ -74,7 +74,12 @@ void QQuickDesignerWindowManager::makeOpenGLContext(QQuickWindow *window) m_openGlContext->create(); if (!m_openGlContext->makeCurrent(window)) qWarning("QQuickWindow: makeCurrent() failed..."); - m_renderContext->initialize(m_openGlContext.data()); + QSGDefaultRenderContext::InitParams params; + params.sampleCount = qMax(1, m_openGlContext->format().samples()); + params.openGLContext = m_openGlContext.data(); + params.initialSurfacePixelSize = window->size() * window->effectiveDevicePixelRatio(); + params.maybeSurface = window; + m_renderContext->initialize(¶ms); } else { m_openGlContext->makeCurrent(window); } diff --git a/src/quick/designer/qquickdesignerwindowmanager_p.h b/src/quick/designer/qquickdesignerwindowmanager_p.h index 5322b6c421..5e387ff5b9 100644 --- a/src/quick/designer/qquickdesignerwindowmanager_p.h +++ b/src/quick/designer/qquickdesignerwindowmanager_p.h @@ -55,18 +55,17 @@ #include <private/qsgrenderloop_p.h> #include <private/qtquickglobal_p.h> -#include <QtQuick/private/qsgcontext_p.h> +#include <private/qsgcontext_p.h> #if QT_CONFIG(opengl) # include <QtGui/QOpenGLContext> #endif - QT_BEGIN_NAMESPACE class QQuickWindow; class QSGContext; -class QSGRenderContext; +class QSGDefaultRenderContext; class QAnimationDriver; class QQuickDesignerWindowManager : public QSGRenderLoop |