aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativecomponent.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/qml/qdeclarativecomponent.h')
-rw-r--r--src/declarative/qml/qdeclarativecomponent.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h
index ab007e8bd8..15004a6cb1 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);
@@ -113,11 +114,10 @@ protected:
Q_INVOKABLE Q_REVISION(1) QScriptValue createObject(QObject* parent, const QScriptValue& valuemap); //XXX Versioning
private:
- QDeclarativeComponent(QDeclarativeEngine *, QDeclarativeCompiledData *, int, int, QObject *parent);
+ QDeclarativeComponent(QDeclarativeEngine *, QDeclarativeCompiledData *, int, QObject *parent);
Q_DISABLE_COPY(QDeclarativeComponent)
friend class QDeclarativeVME;
- friend class QDeclarativeCompositeTypeData;
friend class QDeclarativeTypeData;
};