Commit b0498646 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

Core: Fix MSVC2013 compilation



	shortcutsettings.h(84) : error C2536: 'Core::Internal::ShortcutButton::Core::Internal::ShortcutButton::m_key' : cannot specify explicit initializer for arrays

Change-Id: I8df6f788cd56c75b3fc71b8349a1c77139175460
Reviewed-by: default avatarAlessandro Portale <alessandro.portale@theqtcompany.com>
parent 5aeccb3b
......@@ -115,6 +115,7 @@ namespace Internal {
ShortcutButton::ShortcutButton(QWidget *parent)
: QPushButton(parent)
, m_key({{ 0, 0, 0, 0 }})
{
setToolTip(tr("Click and type the new key sequence."));
setCheckable(true);
......
......@@ -38,6 +38,8 @@
#include <QPointer>
#include <QPushButton>
#include <array>
QT_BEGIN_NAMESPACE
class QGroupBox;
class QKeyEvent;
......@@ -81,7 +83,7 @@ private:
QString m_checkedText;
QString m_uncheckedText;
mutable int m_preferredWidth = -1;
int m_key[4] = { 0, 0, 0, 0 };
std::array<int, 4> m_key;
int m_keyNum = 0;
};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment