diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-11-21 22:36:47 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-11-22 09:40:14 +0100 |
| commit | be443b8edb9822d09cee9a0d5997d1f952836a87 (patch) | |
| tree | 358eb747975dc8b2837f4096a3ca6a7840b86a9e /src/plugins/cpptools/cppcodestylepreferencesfactory.cpp | |
| parent | f0ef96ef0c37b5903bda18e2af80c82f14f30181 (diff) | |
| download | qt-creator-be443b8edb9822d09cee9a0d5997d1f952836a87.tar.gz | |
CppTools: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I31a6117c2b4be3f8603c16a9f98b6937a0b9aeb2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppcodestylepreferencesfactory.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppcodestylepreferencesfactory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp b/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp index d2a6b4c72d..f1cf45634c 100644 --- a/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp +++ b/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp @@ -98,7 +98,7 @@ Core::Id CppCodeStylePreferencesFactory::languageId() QString CppCodeStylePreferencesFactory::displayName() { - return Constants::CPP_SETTINGS_NAME; + return QString::fromUtf8(Constants::CPP_SETTINGS_NAME); } TextEditor::ICodeStylePreferences *CppCodeStylePreferencesFactory::createCodeStyle() const |