diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-05-20 11:37:06 +1000 |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-05-20 11:37:58 +1000 |
| commit | 9bf28fbf0ee26dfde7d6060b10186cfccdcfcd67 (patch) | |
| tree | c323360bf73f2cf5d4ef1e14b4d26e97366a007e /src/declarative | |
| parent | 1ffe4f1b24ca1b75761259da0c9ceefb567f5cf8 (diff) | |
Some of the QML C++ methods should be slots.
Change-Id: Ib9465cf2a7638d013ce831f49ed0177741c22ab0
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/items/qsgview.h | 4 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativecomponent.h | 7 | ||||
| -rw-r--r-- | src/declarative/util/qdeclarativeview.h | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/declarative/items/qsgview.h b/src/declarative/items/qsgview.h index 8e174b7170..242017df6b 100644 --- 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 72e77dab85..6c05881f52 100644 --- 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 530133ea96..48a2786c3c 100644 --- 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); |