diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-08 20:43:45 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-05-08 20:43:45 +0200 |
| commit | b5a956601f369e961d6863126f8facc61bb6df1f (patch) | |
| tree | 25e4021518b254ef76c410244dd6581432bf285f /src/plugins/platforms/windows/qwindowsmenu.cpp | |
| parent | 290f953253afc5935382525cd4b72e091865cab5 (diff) | |
| parent | 1b7337d23dbc767ba482d9051180f10d77052913 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
tests/auto/corelib/io/qresourceengine/qresourceengine_test.pro
Change-Id: I3169f709cc2a1b75007cb23c02c4c79b74feeb04
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsmenu.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsmenu.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowsmenu.cpp b/src/plugins/platforms/windows/qwindowsmenu.cpp index b89e1b66a3..71802b9017 100644 --- a/src/plugins/platforms/windows/qwindowsmenu.cpp +++ b/src/plugins/platforms/windows/qwindowsmenu.cpp @@ -390,6 +390,7 @@ void QWindowsMenuItem::setChecked(bool isChecked) menuItemSetChangeState(parentMenuHandle(), m_id, FALSE, m_checked, MF_CHECKED, MF_UNCHECKED); } +#if QT_CONFIG(shortcut) void QWindowsMenuItem::setShortcut(const QKeySequence &shortcut) { qCDebug(lcQpaMenus) << __FUNCTION__ << '(' << shortcut << ')' << this; @@ -399,6 +400,7 @@ void QWindowsMenuItem::setShortcut(const QKeySequence &shortcut) if (m_parentMenu != nullptr) updateText(); } +#endif void QWindowsMenuItem::setEnabled(bool enabled) { @@ -441,10 +443,12 @@ UINT QWindowsMenuItem::state() const QString QWindowsMenuItem::nativeText() const { QString result = m_text; +#if QT_CONFIG(shortcut) if (!m_shortcut.isEmpty()) { result += QLatin1Char('\t'); result += m_shortcut.toString(QKeySequence::NativeText); } +#endif return result; } @@ -894,8 +898,10 @@ void QWindowsMenuItem::formatDebug(QDebug &d) const d << ", subMenu=" << static_cast<const void *>(m_subMenu); d << ", tag=" << showbase << hex << tag() << noshowbase << dec << ", id=" << m_id; +#if QT_CONFIG(shortcut) if (!m_shortcut.isEmpty()) d << ", shortcut=" << m_shortcut; +#endif if (m_visible) d << " [visible]"; if (m_enabled) |