diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 03:01:14 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 03:01:14 +0200 |
| commit | e96bd2160c1e174c94567ccc78a5bab77f6e9865 (patch) | |
| tree | a638fe6d2f055ff9870670f8a050b4413662ea1c /src/quicktemplates2/qquickabstractbutton_p_p.h | |
| parent | 8e2d1b1efe736760d27af17160f662454546b054 (diff) | |
| parent | 0a827cdee698e7b1b3c9a4096ef7f01ad9d9d32e (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I770f99d20878ddf16ab3f4b1a5422e7192622f64
Diffstat (limited to 'src/quicktemplates2/qquickabstractbutton_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickabstractbutton_p_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickabstractbutton_p_p.h b/src/quicktemplates2/qquickabstractbutton_p_p.h index 7394f115..8ad479e2 100644 --- a/src/quicktemplates2/qquickabstractbutton_p_p.h +++ b/src/quicktemplates2/qquickabstractbutton_p_p.h @@ -50,7 +50,9 @@ #include <QtQuickTemplates2/private/qquickabstractbutton_p.h> #include <QtQuickTemplates2/private/qquickcontrol_p_p.h> -#include <QtGui/qkeysequence.h> +#if QT_CONFIG(shortcut) +# include <QtGui/qkeysequence.h> +#endif QT_BEGIN_NAMESPACE |