diff options
| author | hjk <hjk@qt.io> | 2019-07-24 13:43:54 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-07-29 08:54:18 +0000 |
| commit | e3b1106afae5de6cd54ce627a0b11be041624591 (patch) | |
| tree | accfac6791013e79476650b6dd840d5cf243e12b /src/plugins/texteditor/texteditorsettings.cpp | |
| parent | 02e224fcfa7135f1e32adb02a14426ea153ae618 (diff) | |
Compile fix with recent Qt dev
The reasoning in 1b4766e26c6b did not take into account that the scope
of QT_NO_JAVA_STYLE_ITERATORS may change over time, as done with
f70905448f6 in Qt base.
Change-Id: Ib1966ff26c4d36d5f62e149d6b45baa4aecf825d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/texteditor/texteditorsettings.cpp')
| -rw-r--r-- | src/plugins/texteditor/texteditorsettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp index bdc7e7a583..3d66f387e4 100644 --- a/src/plugins/texteditor/texteditorsettings.cpp +++ b/src/plugins/texteditor/texteditorsettings.cpp @@ -473,7 +473,7 @@ void TextEditorSettings::unregisterCodeStyleFactory(Core::Id languageId) d->m_languageToFactory.remove(languageId); } -QMap<Core::Id, ICodeStylePreferencesFactory *> TextEditorSettings::codeStyleFactories() +const QMap<Core::Id, ICodeStylePreferencesFactory *> &TextEditorSettings::codeStyleFactories() { return d->m_languageToFactory; } |