summaryrefslogtreecommitdiff
path: root/src/libs/qmljs/qmljscodeformatter.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2012-11-28 14:57:55 +0200
committerFawzi Mohamed <fawzi.mohamed@digia.com>2012-11-28 23:18:42 +0100
commitcd6302502b3b7ff6ef95426e3274f84b74dd0335 (patch)
tree18f50c23312852e940c7872532278360f1d4d65b /src/libs/qmljs/qmljscodeformatter.cpp
parenta44aa55502b1d9f548692e49ab7cea13d341c8ca (diff)
downloadqt-creator-cd6302502b3b7ff6ef95426e3274f84b74dd0335.tar.gz
QmlJS: Revert CodeFormatter::stateToString return type to QString
Change-Id: I532327126dfdbe4d338d7afd0bcbe5e27ba206d9 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Diffstat (limited to 'src/libs/qmljs/qmljscodeformatter.cpp')
-rw-r--r--src/libs/qmljs/qmljscodeformatter.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/qmljs/qmljscodeformatter.cpp b/src/libs/qmljs/qmljscodeformatter.cpp
index 813d561045..8c26a9ca42 100644
--- a/src/libs/qmljs/qmljscodeformatter.cpp
+++ b/src/libs/qmljs/qmljscodeformatter.cpp
@@ -1019,10 +1019,10 @@ void CodeFormatter::dump() const
qDebug() << "Current indent depth:" << m_indentDepth;
}
-QByteArray CodeFormatter::stateToString(int type) const
+QString CodeFormatter::stateToString(int type) const
{
const QMetaEnum &metaEnum = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("StateType"));
- return metaEnum.valueToKey(type);
+ return QString::fromUtf8(metaEnum.valueToKey(type));
}
QtStyleCodeFormatter::QtStyleCodeFormatter()