qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Change-Id: Ib9465cf2a7638d013ce831f49ed0177741c22ab0
This commit is contained in:
Martin Jones 2011-05-20 11:37:06 +10:00
parent 1ffe4f1b24
commit 9bf28fbf0e
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/declarative/items/qsgview.h
View File

@ -73,7 +73,6 @@ public:
virtual ~QSGView(); virtual ~QSGView();
QUrl source() const; QUrl source() const;
void setSource(const QUrl&);
QDeclarativeEngine* engine() const; QDeclarativeEngine* engine() const;
QDeclarativeContext* rootContext() const; QDeclarativeContext* rootContext() const;
@ -92,6 +91,9 @@ public:
QSize sizeHint() const; QSize sizeHint() const;
QSize initialSize() const; QSize initialSize() const;
public Q_SLOTS:
void setSource(const QUrl&);
Q_SIGNALS: Q_SIGNALS:
void statusChanged(QSGView::Status); void statusChanged(QSGView::Status);

7
src/declarative/qml/qdeclarativecomponent.h
View File

@ -96,13 +96,14 @@ public:
virtual QObject *beginCreate(QDeclarativeContext *); virtual QObject *beginCreate(QDeclarativeContext *);
virtual void completeCreate(); virtual void completeCreate();
void loadUrl(const QUrl &url);
void setData(const QByteArray &, const QUrl &baseUrl);
QDeclarativeContext *creationContext() const; QDeclarativeContext *creationContext() const;
static QDeclarativeComponentAttached *qmlAttachedProperties(QObject *); static QDeclarativeComponentAttached *qmlAttachedProperties(QObject *);
public Q_SLOTS:
void loadUrl(const QUrl &url);
void setData(const QByteArray &, const QUrl &baseUrl);
Q_SIGNALS: Q_SIGNALS:
void statusChanged(QDeclarativeComponent::Status); void statusChanged(QDeclarativeComponent::Status);
void progressChanged(qreal); void progressChanged(qreal);

4
src/declarative/util/qdeclarativeview.h
View File

@ -73,7 +73,6 @@ public:
virtual ~QDeclarativeView(); virtual ~QDeclarativeView();
QUrl source() const; QUrl source() const;
void setSource(const QUrl&);
QDeclarativeEngine* engine() const; QDeclarativeEngine* engine() const;
QDeclarativeContext* rootContext() const; QDeclarativeContext* rootContext() const;
@ -92,6 +91,9 @@ public:
QSize sizeHint() const; QSize sizeHint() const;
QSize initialSize() const; QSize initialSize() const;
public Q_SLOTS:
void setSource(const QUrl&);
Q_SIGNALS: Q_SIGNALS:
void sceneResized(QSize size); // ??? void sceneResized(QSize size); // ???
void statusChanged(QDeclarativeView::Status); void statusChanged(QDeclarativeView::Status);