diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-10-30 09:13:04 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-10-30 09:13:04 +0100 |
| commit | 970ff81a14c93c4f41f384026220d4baad8eec70 (patch) | |
| tree | b99ff97b74be8ddcddd5b5037f172aea06623581 /src/quick/items/qquickitem_p.h | |
| parent | 4b73acd49cc4f08a5169efba8169f968094063e0 (diff) | |
| parent | 4e33b069c426c975319d91e11223114fd0d8ad40 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/quick/items/qquickitem_p.h')
| -rw-r--r-- | src/quick/items/qquickitem_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index 461b2f3485..02d3b820a0 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -511,7 +511,7 @@ public: inline qreal rotation() const { return extra.isAllocated()?extra->rotation:0; } inline qreal opacity() const { return extra.isAllocated()?extra->opacity:1; } - void setAccessibleFlagAndListener(); + void setAccessible(); virtual qreal getImplicitWidth() const; virtual qreal getImplicitHeight() const; @@ -633,7 +633,7 @@ public: bool backtabSet : 1; }; -class QQuickKeyNavigationAttached : public QObject, public QQuickItemKeyFilter +class Q_QUICK_PRIVATE_EXPORT QQuickKeyNavigationAttached : public QObject, public QQuickItemKeyFilter { Q_OBJECT Q_DECLARE_PRIVATE(QQuickKeyNavigationAttached) |