summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@qt.io>2017-03-02 14:12:36 +0100
committerPaul Olav Tvete <paul.tvete@qt.io>2017-03-03 08:03:55 +0000
commit45db515ffa27fb3e69ed1c6285f919064f6fe27b (patch)
tree85f2b562ad851e2cbb0b76c996da4a3757b20644
parent9b160e81af2b2e5ad0eb0a3ac51cdb25d7a410e6 (diff)
downloadqtquickcontrols-45db515ffa27fb3e69ed1c6285f919064f6fe27b.tar.gz
Build fix for -no-feature-shortcut
Change-Id: I63f1990f72d0eb736c5e1ecba5574bb13f9ef127 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--src/controls/qquickaction.cpp12
-rw-r--r--src/controls/qquickmenuitem.cpp2
2 files changed, 14 insertions, 0 deletions
diff --git a/src/controls/qquickaction.cpp b/src/controls/qquickaction.cpp
index 424f1042..836c02da 100644
--- a/src/controls/qquickaction.cpp
+++ b/src/controls/qquickaction.cpp
@@ -282,11 +282,16 @@ bool qMnemonicContextMatcher(QObject *o, Qt::ShortcutContext context)
QVariant QQuickAction1::shortcut() const
{
+#if QT_CONFIG(shortcut)
return m_shortcut.toString(QKeySequence::NativeText);
+#else
+ return QString();
+#endif
}
void QQuickAction1::setShortcut(const QVariant &arg)
{
+#if QT_CONFIG(shortcut)
QKeySequence sequence;
if (arg.type() == QVariant::Int)
sequence = QKeySequence(static_cast<QKeySequence::StandardKey>(arg.toInt()));
@@ -306,10 +311,12 @@ void QQuickAction1::setShortcut(const QVariant &arg)
QGuiApplicationPrivate::instance()->shortcutMap.addShortcut(this, m_shortcut, context, qShortcutContextMatcher);
}
emit shortcutChanged(shortcut());
+#endif // QT_CONFIG(shortcut)
}
void QQuickAction1::setMnemonicFromText(const QString &text)
{
+#if QT_CONFIG(shortcut)
QKeySequence sequence = QKeySequence::mnemonic(text);
if (m_mnemonic == sequence)
return;
@@ -323,6 +330,7 @@ void QQuickAction1::setMnemonicFromText(const QString &text)
Qt::ShortcutContext context = Qt::WindowShortcut;
QGuiApplicationPrivate::instance()->shortcutMap.addShortcut(this, m_mnemonic, context, qMnemonicContextMatcher);
}
+#endif // QT_CONFIG(shortcut)
}
void QQuickAction1::setIconSource(const QUrl &iconSource)
@@ -418,6 +426,7 @@ void QQuickAction1::setExclusiveGroup(QQuickExclusiveGroup1 *eg)
bool QQuickAction1::event(QEvent *e)
{
+#if QT_CONFIG(shortcut)
if (!m_enabled)
return false;
@@ -437,6 +446,9 @@ bool QQuickAction1::event(QEvent *e)
trigger();
return true;
+#else
+ return false;
+#endif // QT_CONFIG(shortcut)
}
void QQuickAction1::trigger(QObject *source)
diff --git a/src/controls/qquickmenuitem.cpp b/src/controls/qquickmenuitem.cpp
index 3c5bfe4b..60aa0f6f 100644
--- a/src/controls/qquickmenuitem.cpp
+++ b/src/controls/qquickmenuitem.cpp
@@ -606,6 +606,7 @@ void QQuickMenuItem1::setShortcut(const QVariant &shortcut)
void QQuickMenuItem1::updateShortcut()
{
+#if QT_CONFIG(shortcut)
if (platformItem()) {
QKeySequence sequence;
QVariant var = shortcut();
@@ -617,6 +618,7 @@ void QQuickMenuItem1::updateShortcut()
syncWithPlatformMenu();
}
emit shortcutChanged();
+#endif // QT_CONFIG(shortcut)
}
bool QQuickMenuItem1::checkable() const