Some of the QML C++ methods should be slots.

Change-Id: Ib9465cf2a7638d013ce831f49ed0177741c22ab0

diff --git a/src/declarative/items/qsgview.h b/src/declarative/items/qsgview.h
index 8e174b7..242017d 100644 (file)
--- a/src/declarative/items/qsgview.h
+++ b/src/declarative/items/qsgview.h
@@ -73,7 +73,6 @@ public:
     virtual ~QSGView();
 
     QUrl source() const;
-    void setSource(const QUrl&);
 
     QDeclarativeEngine* engine() const;
     QDeclarativeContext* rootContext() const;
@@ -92,6 +91,9 @@ public:
     QSize sizeHint() const;
     QSize initialSize() const;
 
+public Q_SLOTS:
+    void setSource(const QUrl&);
+
 Q_SIGNALS:
     void statusChanged(QSGView::Status);
 

diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h
index 72e77da..6c05881 100644 (file)
--- a/src/declarative/qml/qdeclarativecomponent.h
+++ b/src/declarative/qml/qdeclarativecomponent.h
@@ -96,13 +96,14 @@ public:
     virtual QObject *beginCreate(QDeclarativeContext *);
     virtual void completeCreate();
 
-    void loadUrl(const QUrl &url);
-    void setData(const QByteArray &, const QUrl &baseUrl);
-
     QDeclarativeContext *creationContext() const;
 
     static QDeclarativeComponentAttached *qmlAttachedProperties(QObject *);
 
+public Q_SLOTS:
+    void loadUrl(const QUrl &url);
+    void setData(const QByteArray &, const QUrl &baseUrl);
+
 Q_SIGNALS:
     void statusChanged(QDeclarativeComponent::Status);
     void progressChanged(qreal);

diff --git a/src/declarative/util/qdeclarativeview.h b/src/declarative/util/qdeclarativeview.h
index 530133e..48a2786 100644 (file)
--- a/src/declarative/util/qdeclarativeview.h
+++ b/src/declarative/util/qdeclarativeview.h
@@ -73,7 +73,6 @@ public:
     virtual ~QDeclarativeView();
 
     QUrl source() const;
-    void setSource(const QUrl&);
 
     QDeclarativeEngine* engine() const;
     QDeclarativeContext* rootContext() const;
@@ -92,6 +91,9 @@ public:
     QSize sizeHint() const;
     QSize initialSize() const;
 
+public Q_SLOTS:
+    void setSource(const QUrl&);
+
 Q_SIGNALS:
     void sceneResized(QSize size); // ???
     void statusChanged(QDeclarativeView::Status);