diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-02-27 13:54:26 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-15 15:25:03 +0100 |
| commit | 1366ad57bca2e45adfd624106602af6bf1f12044 (patch) | |
| tree | f016be5994244da70339112efd772443e3de6e7b | |
| parent | 9de735316042cdf28e7013727b3198b10f15235b (diff) | |
QQuickWindow: expose activeFocusItem as a property
Change-Id: Ifd393399f93b04313cd66d7873fb99b505640c8a
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 10 | ||||
| -rw-r--r-- | src/quick/items/qquickwindow.h | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 48e2aceebe..594897eae3 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -403,6 +403,8 @@ void QQuickWindowPrivate::init(QQuickWindow *c) QObject::connect(context, SIGNAL(initialized()), q, SIGNAL(sceneGraphInitialized()), Qt::DirectConnection); QObject::connect(context, SIGNAL(invalidated()), q, SIGNAL(sceneGraphInvalidated()), Qt::DirectConnection); QObject::connect(context, SIGNAL(invalidated()), q, SLOT(cleanupSceneGraph()), Qt::DirectConnection); + + QObject::connect(q, SIGNAL(focusObjectChanged(QObject*)), q, SIGNAL(activeFocusItemChanged())); } /*! @@ -2985,6 +2987,14 @@ QColor QQuickWindow::color() const \since Qt 5.1 */ +/*! + \qmlproperty Item QtQuick.Window2::Window::activeFocusItem + \since Qt 5.1 + + The item which currently has active focus or \c null if there is + no item with active focus. + */ + #include "moc_qquickwindow.cpp" QT_END_NAMESPACE diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h index 959c52b37c..a2ba9e9fe0 100644 --- a/src/quick/items/qquickwindow.h +++ b/src/quick/items/qquickwindow.h @@ -64,6 +64,7 @@ class Q_QUICK_EXPORT QQuickWindow : public QWindow Q_PRIVATE_PROPERTY(QQuickWindow::d_func(), QQmlListProperty<QObject> data READ data DESIGNABLE false) Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) Q_PROPERTY(QQuickItem* contentItem READ contentItem CONSTANT FINAL) + Q_PROPERTY(QQuickItem* activeFocusItem READ activeFocusItem NOTIFY activeFocusItemChanged REVISION 1) Q_CLASSINFO("DefaultProperty", "data") Q_DECLARE_PRIVATE(QQuickWindow) public: @@ -129,6 +130,7 @@ Q_SIGNALS: void beforeRendering(); void afterRendering(); void colorChanged(const QColor &); + Q_REVISION(1) void activeFocusItemChanged(); public Q_SLOTS: void update(); |