diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-09-10 15:27:58 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-09-24 15:21:04 +0200 |
| commit | 5b21f8529ebc8e3e66ec6d057734f90b10bb7657 (patch) | |
| tree | fba57d3dc202399571a1a3ee2ca2d3e21357a987 /src/quick/items/qquickwindow.h | |
| parent | c2706491906c053f5d38ddc0558a993bbf7cfd3e (diff) | |
move QQuickWindowAttached to QQuickWindowQmlImpl
It causes problems to do qmlRegisterType on QQuickWindow if the
attached property also refers to QQuickWindow.
Task-number: QTBUG-40816
Task-number: QTBUG-41047
Change-Id: I7a6f75af52f65e2be022b97128702982bec7cbe8
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/quick/items/qquickwindow.h')
| -rw-r--r-- | src/quick/items/qquickwindow.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h index 7547d76ae9..b52d6b807e 100644 --- a/src/quick/items/qquickwindow.h +++ b/src/quick/items/qquickwindow.h @@ -142,8 +142,6 @@ public: void scheduleRenderJob(QRunnable *job, RenderStage schedule); - static QQuickWindowAttached *qmlAttachedProperties(QObject *object); - Q_SIGNALS: void frameSwapped(); Q_REVISION(2) void openglContextCreated(QOpenGLContext *context); @@ -208,7 +206,6 @@ private: QT_END_NAMESPACE Q_DECLARE_METATYPE(QQuickWindow *) -QML_DECLARE_TYPEINFO(QQuickWindow, QML_HAS_ATTACHED_PROPERTIES) #endif // QQUICKWINDOW_H |