Re: [Development] Qt 5.3 header diff: QtQuick

[Alan Alpert]

On Wed, Apr 23, 2014 at 3:56 AM, Simon Hausmann
 wrote:
> On Tuesday 22. April 2014 16.37.50 Thiago Macieira wrote:
>> Em ter 22 abr 2014, às 14:12:46, Thiago Macieira escreveu:
>> > http://macieira.org/~thiago/qt-5.3/QtQuick.diff
>>
>> Looks fine from the C++ side. I have no clue what those Q_REVISION changes
>> do to QML.
>
> I don't think we need them actually, but they won't hurt :)
>

I don't think there's any way to revision the added RESET signal. But
since it's a bool, code that tried to assign undefined wouldn't have
compiled before anyways.

The Q_REVISIONs look like they're on new signals, in which case they
are actually needed. But this means the changes look fine from the QML
side :) .


--
Alan Alpert
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Qt 5.3 header diff: QtQuick

[Simon Hausmann]

On Tuesday 22. April 2014 16.37.50 Thiago Macieira wrote:
> Em ter 22 abr 2014, às 14:12:46, Thiago Macieira escreveu:
> > http://macieira.org/~thiago/qt-5.3/QtQuick.diff
> 
> Looks fine from the C++ side. I have no clue what those Q_REVISION changes
> do to QML.

I don't think we need them actually, but they won't hurt :)


Simon
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Qt 5.3 header diff: QtQuick

[Thiago Macieira]

Em ter 22 abr 2014, às 14:12:46, Thiago Macieira escreveu:
> http://macieira.org/~thiago/qt-5.3/QtQuick.diff

Looks fine from the C++ side. I have no clue what those Q_REVISION changes do 
to QML.
-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center

___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

[Development] Qt 5.3 header diff: QtQuick

[Thiago Macieira]

http://macieira.org/~thiago/qt-5.3/QtQuick.diff
diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h
index 2500a2d..2b08cc2 100644
--- a/src/quick/items/qquickitem.h
+++ b/src/quick/items/qquickitem.h
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickItem;
 class QQuickTransformPrivate;
-class QQuickTransform : public QObject
+class Q_QUICK_EXPORT QQuickTransform : public QObject
 {
 Q_OBJECT
 public:
@@ -141,7 +141,7 @@ class Q_QUICK_EXPORT QQuickItem : public QObject, public QQmlParserStatus
 Q_PROPERTY(QQmlListProperty transform READ transform DESIGNABLE false FINAL)
 
 Q_PROPERTY(bool smooth READ smooth WRITE setSmooth NOTIFY smoothChanged)
-Q_PROPERTY(bool antialiasing READ antialiasing WRITE setAntialiasing NOTIFY antialiasingChanged)
+Q_PROPERTY(bool antialiasing READ antialiasing WRITE setAntialiasing NOTIFY antialiasingChanged RESET resetAntialiasing)
 Q_PROPERTY(qreal implicitWidth READ implicitWidth WRITE setImplicitWidth NOTIFY implicitWidthChanged)
 Q_PROPERTY(qreal implicitHeight READ implicitHeight WRITE setImplicitHeight NOTIFY implicitHeightChanged)
 
@@ -172,7 +172,8 @@ public:
 ItemParentHasChanged,  // value.item
 ItemOpacityHasChanged, // value.realValue
 ItemActiveFocusHasChanged, // value.boolValue
-ItemRotationHasChanged // value.realValue
+ItemRotationHasChanged,// value.realValue
+ItemAntialiasingHasChanged // value.boolValue
 };
 
 union ItemChangeData {
@@ -267,6 +268,7 @@ public:
 
 bool antialiasing() const;
 void setAntialiasing(bool);
+void resetAntialiasing();
 
 Flags flags() const;
 void setFlag(Flag flag, bool enabled = true);
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h
index 5063b3b..2572f31 100644
--- a/src/quick/items/qquickwindow.h
+++ b/src/quick/items/qquickwindow.h
@@ -58,6 +58,7 @@ class QOpenGLFramebufferObject;
 class QQmlIncubationController;
 class QInputMethodEvent;
 class QQuickCloseEvent;
+class QQuickRenderControl;
 
 class Q_QUICK_EXPORT QQuickWindow : public QWindow
 {
@@ -78,6 +79,11 @@ public:
 
 Q_DECLARE_FLAGS(CreateTextureOptions, CreateTextureOption)
 
+enum SceneGraphError {
+ContextNotAvailable = 1
+};
+Q_ENUMS(SceneGraphError)
+
 QQuickWindow(QWindow *parent = 0);
 
 virtual ~QQuickWindow();
@@ -132,14 +138,21 @@ public:
 
 Q_SIGNALS:
 void frameSwapped();
+Q_REVISION(2) void openglContextCreated(QOpenGLContext *context);
 void sceneGraphInitialized();
 void sceneGraphInvalidated();
 void beforeSynchronizing();
+Q_REVISION(2) void afterSynchronizing();
 void beforeRendering();
 void afterRendering();
+Q_REVISION(2) void afterAnimating();
+Q_REVISION(2) void sceneGraphAboutToStop();
+
 Q_REVISION(1) void closing(QQuickCloseEvent *close);
 void colorChanged(const QColor &);
 Q_REVISION(1) void activeFocusItemChanged();
+Q_REVISION(2) void sceneGraphError(QQuickWindow::SceneGraphError error, const QString &message);
+
 
 public Q_SLOTS:
 void update();
@@ -177,7 +190,10 @@ private Q_SLOTS:
 
 private:
 friend class QQuickItem;
+friend class QQuickWidget;
+friend class QQuickWidgetPrivate;
 friend class QQuickAnimatorController;
+explicit QQuickWindow(QQuickRenderControl*);
 Q_DISABLE_COPY(QQuickWindow)
 };
 
diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.h b/src/quick/scenegraph/coreapi/qsgmaterial.h
index bfe570c..98f4d8a 100644
--- a/src/quick/scenegraph/coreapi/qsgmaterial.h
+++ b/src/quick/scenegraph/coreapi/qsgmaterial.h
@@ -103,7 +103,7 @@ protected:
 Q_DECLARE_PRIVATE(QSGMaterialShader)
 QSGMaterialShader(QSGMaterialShaderPrivate &dd);
 
-friend class QSGContext;
+friend class QSGRenderContext;
 friend class QSGBatchRenderer::ShaderManager;
 
 void setShaderSourceFile(QOpenGLShader::ShaderType type, const QString &sourceFile);
diff --git a/src/quick/scenegraph/coreapi/qsgnode.h b/src/quick/scenegraph/coreapi/qsgnode.h
index 60e7652..f85184d 100644
--- a/src/quick/scenegraph/coreapi/qsgnode.h
+++ b/src/quick/scenegraph/coreapi/qsgnode.h
@@ -161,6 +161,7 @@ protected:
 private:
 friend class QSGRootNode;
 friend class QSGBatchRenderer::Renderer;
+friend class QSGRenderer;
 
 void init();
 void destroy();
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development