diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-10-18 11:00:53 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-10-18 13:55:02 +0200 |
| commit | 164a890573dacf619f2b4c48714fae49f0ab9711 (patch) | |
| tree | 0e5f49c872bb6325e94cfadf4fc49ad552572d47 /tests/auto/quick/qquickitem2 | |
| parent | 77a433a21cde393783524fd3c242564e05dcbb5f (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: Icad95584ae12aa97a56b56ef27206cef1b1ba48f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/quick/qquickitem2')
| -rw-r--r-- | tests/auto/quick/qquickitem2/tst_qquickitem.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp index 399535cfa6..607cf91bfe 100644 --- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp +++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp @@ -76,8 +76,10 @@ private slots: void qtbug_50516_2(); void keys(); +#if QT_CONFIG(shortcut) void standardKeys_data(); void standardKeys(); +#endif void keysProcessingOrder(); void keysim(); void keysForward(); @@ -1429,6 +1431,8 @@ void tst_QQuickItem::keys() delete testObject; } +#if QT_CONFIG(shortcut) + Q_DECLARE_METATYPE(QEvent::Type); Q_DECLARE_METATYPE(QKeySequence::StandardKey); @@ -1487,6 +1491,8 @@ void tst_QQuickItem::standardKeys() QCOMPARE(item->property("released").toBool(), released); } +#endif // QT_CONFIG(shortcut) + void tst_QQuickItem::keysProcessingOrder() { QQuickView *window = new QQuickView(nullptr); |