diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-10-18 11:09:08 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-10-18 15:56:14 +0200 |
commit | 186956ca2bca6a425053ad3b0b53b4efffeea84d (patch) | |
tree | 6dbf63a78d9155f3dcc1b894a5cc998058014d64 /src/quicktemplates2/qquickpopupitem.cpp | |
parent | ed9edbf2f7af25e9d747e4dce424425242a63947 (diff) |
Handle -no-feature-shortcut
Preparing for the extraction of QGuiShortcut, the shortcut
feature will changed to follow the convention of using
QT_REQUIRE_CONFIG(shortcut) in the affected class headers.
Add the required exclusions to prevent compile errors
when disabling shortcuts.
Task-number: QTBUG-76493
Change-Id: I726239a6bcf1974616edc604ffc7ae4138db833a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickpopupitem.cpp')
-rw-r--r-- | src/quicktemplates2/qquickpopupitem.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickpopupitem.cpp b/src/quicktemplates2/qquickpopupitem.cpp index 16d8c4f6..28ddde66 100644 --- a/src/quicktemplates2/qquickpopupitem.cpp +++ b/src/quicktemplates2/qquickpopupitem.cpp @@ -42,7 +42,9 @@ #include "qquickpopup_p_p.h" #include "qquickdeferredexecute_p_p.h" -#include <QtGui/private/qshortcutmap_p.h> +#if QT_CONFIG(shortcut) +# include <QtGui/private/qshortcutmap_p.h> +#endif #include <QtGui/private/qguiapplication_p.h> QT_BEGIN_NAMESPACE |