Move Q_PROPERTY()'s to top of object

Q_PROPERTY() macros without a semicolon inside a class access
block (public:) confuses moc into ignoring Q_INVOKABLES

2 files changed, 5 insertions, 5 deletions

diff --git a/src/declarative/qml/qmlcomponentjs_p.h b/src/declarative/qml/qmlcomponentjs_p.h
index 0f56766..3213929 100644
--- a/src/declarative/qml/qmlcomponentjs_p.h
+++ b/src/declarative/qml/qmlcomponentjs_p.h
@@ -69,14 +69,14 @@ class Q_DECLARATIVE_EXPORT QmlComponentJS : public QmlComponent
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QmlComponentJS)
-    friend class QmlEngine;
-public:
-    QmlComponentJS(QmlEngine *, const QUrl &url, QObject *parent = 0);
-    QmlComponentJS(QmlEngine *, QObject *parent=0);
     Q_PROPERTY(bool isNull READ isNull NOTIFY isNullChanged)
     Q_PROPERTY(bool isReady READ isReady NOTIFY isReadyChanged)
     Q_PROPERTY(bool isError READ isError NOTIFY isErrorChanged)
     Q_PROPERTY(bool isLoading READ isLoading NOTIFY isLoadingChanged)
+    friend class QmlEngine;
+public:
+    QmlComponentJS(QmlEngine *, const QUrl &url, QObject *parent = 0);
+    QmlComponentJS(QmlEngine *, QObject *parent=0);
 
     Q_INVOKABLE QScriptValue createObject();
     Q_INVOKABLE QString errorsString() const;
diff --git a/src/declarative/util/qmlpackage.cpp b/src/declarative/util/qmlpackage.cpp
index 912bb6b..7df8453 100644
--- a/src/declarative/util/qmlpackage.cpp
+++ b/src/declarative/util/qmlpackage.cpp
@@ -55,11 +55,11 @@ public:
 class QmlPackageAttached : public QObject
 {
 Q_OBJECT
+Q_PROPERTY(QString name READ name WRITE setName)
 public:
     QmlPackageAttached(QObject *parent);
     virtual ~QmlPackageAttached();
 
-    Q_PROPERTY(QString name READ name WRITE setName)
     QString name() const;
     void setName(const QString &n);