From 109c3f06f80722e64ed547ec644a77c870cc370d Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 7 Feb 2018 09:49:03 +0100 Subject: [PATCH] TextEditor: Fix compile with Qt5.6/gcc4.9 Amends 91c19c2734246dbf528a6076a57b72d924bf0484. Change-Id: I556c2336ac2bbde7f7f2acf4ed9339809a918b55 Reviewed-by: hjk --- src/plugins/cpptools/cppcodestylepreferencesfactory.cpp | 2 +- src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp b/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp index 27b9d3877bb..6eb401f3ec9 100644 --- a/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp +++ b/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp @@ -120,7 +120,7 @@ TextEditor::Indenter *CppCodeStylePreferencesFactory::createIndenter() const QString CppCodeStylePreferencesFactory::snippetProviderGroupId() const { - return CppEditor::Constants::CPP_SNIPPETS_GROUP_ID; + return QString(CppEditor::Constants::CPP_SNIPPETS_GROUP_ID); } QString CppCodeStylePreferencesFactory::previewText() const diff --git a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp index f5c259dca05..e1d395f8f9c 100644 --- a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp +++ b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp @@ -89,7 +89,7 @@ TextEditor::Indenter *QmlJSCodeStylePreferencesFactory::createIndenter() const QString QmlJSCodeStylePreferencesFactory::snippetProviderGroupId() const { - return QmlJSEditor::Constants::QML_SNIPPETS_GROUP_ID; + return QString(QmlJSEditor::Constants::QML_SNIPPETS_GROUP_ID); } QString QmlJSCodeStylePreferencesFactory::previewText() const