diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-06 14:38:07 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-06 14:38:07 +0100 |
| commit | 49a2ec05b43b49d06dba8c6909c9df8d308e127d (patch) | |
| tree | 46d596c4c0e184aab0d4698f05247d1ed13c7e9a /src/platformsupport/linuxaccessibility/application_p.h | |
| parent | b86106387350f673a20d3b0a2413023f6205169b (diff) | |
| parent | 31c5b34e808db102bfc5364405711ec94fe51f0a (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/platforms/qnx/qqnxscreen.cpp
src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
Change-Id: Ib64f21c077b54f2291d19187590bfe869b98477a
Diffstat (limited to 'src/platformsupport/linuxaccessibility/application_p.h')
| -rw-r--r-- | src/platformsupport/linuxaccessibility/application_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/platformsupport/linuxaccessibility/application_p.h b/src/platformsupport/linuxaccessibility/application_p.h index 5efd7089ea..e8684ab2b5 100644 --- a/src/platformsupport/linuxaccessibility/application_p.h +++ b/src/platformsupport/linuxaccessibility/application_p.h @@ -42,6 +42,7 @@ #ifndef Q_SPI_APPLICATION_H #define Q_SPI_APPLICATION_H +#include <QtCore/QPointer> #include <QtCore/QQueue> #include <QtDBus/QDBusConnection> #include <QtGui/QAccessibleInterface> @@ -75,7 +76,7 @@ private Q_SLOTS: private: static QKeyEvent* copyKeyEvent(QKeyEvent*); - QQueue<QPair<QObject*, QKeyEvent*> > keyEvents; + QQueue<QPair<QPointer<QObject>, QKeyEvent*> > keyEvents; QDBusConnection dbusConnection; }; |