diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-26 01:00:18 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-26 01:00:19 +0100 |
| commit | 04479f19522879dad821b0e643d0576d19a6d689 (patch) | |
| tree | 2294bb6cb66c34457d6b4eda5c07b3e441be6a59 /src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.h | |
| parent | 85b0ce8ca36d52db71b519ee8d2a1ce369c53a81 (diff) | |
| parent | 00cfb4d7801ec9b5d9b070879ef4a962390628b7 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Id511850002d9274d17891c063376ac4b3ff939dd
Diffstat (limited to 'src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.h')
| -rw-r--r-- | src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.h b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.h index 2be88bb4c0..3497c6a6f1 100644 --- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.h +++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.h @@ -76,7 +76,9 @@ public: QIconEngine *createIconEngine(const QString &iconName) const override; +#if QT_CONFIG(shortcut) QList<QKeySequence> keyBindings(QKeySequence::StandardKey key) const override; +#endif QString standardButtonText(int button) const override; |