From b04986465d63bb27bb4be473574ece761d4f1e8c Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sun, 17 May 2015 08:48:19 +0300
Subject: [PATCH] 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: Alessandro Portale <alessandro.portale@theqtcompany.com>
---
src/plugins/coreplugin/dialogs/shortcutsettings.cpp | 1 +
src/plugins/coreplugin/dialogs/shortcutsettings.h | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
index b6812564cc7..94f78cf5d50 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
@@ -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);
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.h b/src/plugins/coreplugin/dialogs/shortcutsettings.h
index 2a61d017af7..0b35836f5a0 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.h
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.h
@@ -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;
};
--
GitLab