feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: Fix compile with Qt5.6/gcc4.9

Browse Source 
Amends 91c19c2734.

Change-Id: I556c2336ac2bbde7f7f2acf4ed9339809a918b55
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2018-02-07 09:49:03 +01:00
parent 921c4b9aa2
commit 109c3f06f8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cpptools/cppcodestylepreferencesfactory.cpp
View File

@@ -120,7 +120,7 @@ TextEditor::Indenter *CppCodeStylePreferencesFactory::createIndenter() const
QString CppCodeStylePreferencesFactory::snippetProviderGroupId() const QString CppCodeStylePreferencesFactory::snippetProviderGroupId() const
{ {
return CppEditor::Constants::CPP_SNIPPETS_GROUP_ID; return QString(CppEditor::Constants::CPP_SNIPPETS_GROUP_ID);
} }
QString CppCodeStylePreferencesFactory::previewText() const QString CppCodeStylePreferencesFactory::previewText() const

2
src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
View File

@@ -89,7 +89,7 @@ TextEditor::Indenter *QmlJSCodeStylePreferencesFactory::createIndenter() const
QString QmlJSCodeStylePreferencesFactory::snippetProviderGroupId() const QString QmlJSCodeStylePreferencesFactory::snippetProviderGroupId() const
{ {
return QmlJSEditor::Constants::QML_SNIPPETS_GROUP_ID; return QString(QmlJSEditor::Constants::QML_SNIPPETS_GROUP_ID);
} }
QString QmlJSCodeStylePreferencesFactory::previewText() const QString QmlJSCodeStylePreferencesFactory::previewText() const