diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2018-12-03 14:32:28 +0200 |
|---|---|---|
| committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2018-12-03 13:08:57 +0000 |
| commit | b60c05b8eeb30b3ff5d6fe0257ec9617afa2fae3 (patch) | |
| tree | 3d4060f40ff38cfd9c29f817207c21f8f720785b /src | |
| parent | 3715b42724b2683454a1ffc1e7d31e13ea449520 (diff) | |
Fix compilation with gcc 4.8
GCC 4.8 doesn't like using QPointer in signal connections,
and it also doesn't like duplicate friend declarations.
Change-Id: I08a775c056ae642e90725f26bc44baa9691eafaf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Diffstat (limited to 'src')
| -rw-r--r-- | src/virtualkeyboard/qvirtualkeyboardinputcontext.h | 1 | ||||
| -rw-r--r-- | src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext.h b/src/virtualkeyboard/qvirtualkeyboardinputcontext.h index f55d8cae..58cab483 100644 --- a/src/virtualkeyboard/qvirtualkeyboardinputcontext.h +++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext.h @@ -124,7 +124,6 @@ Q_SIGNALS: void cursorRectIntersectsClipRectChanged(); private: - friend class QVirtualKeyboardInputContextPrivate; QScopedPointer<QVirtualKeyboardInputContextPrivate> d_ptr; }; diff --git a/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp index 99ea6ae0..19c5ce19 100644 --- a/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp +++ b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp @@ -178,8 +178,8 @@ void QVirtualKeyboardSelectionListModel::setDataSource(QVirtualKeyboardAbstractI } d->dataSource = dataSource; if (d->dataSource) { - QObject::connect(d->dataSource, &QVirtualKeyboardAbstractInputMethod::selectionListChanged, this, &QVirtualKeyboardSelectionListModel::selectionListChanged); - QObject::connect(d->dataSource, &QVirtualKeyboardAbstractInputMethod::selectionListActiveItemChanged, this, &QVirtualKeyboardSelectionListModel::selectionListActiveItemChanged); + QObject::connect(d->dataSource.data(), &QVirtualKeyboardAbstractInputMethod::selectionListChanged, this, &QVirtualKeyboardSelectionListModel::selectionListChanged); + QObject::connect(d->dataSource.data(), &QVirtualKeyboardAbstractInputMethod::selectionListActiveItemChanged, this, &QVirtualKeyboardSelectionListModel::selectionListActiveItemChanged); } } |