diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-11-23 14:42:27 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-12-01 19:52:53 +0000 |
| commit | 3fcc79261067fd4817c38fa9fc10d872507c6ee9 (patch) | |
| tree | 7a1235d9e6bbd4a2233d58212f75fd214f2633c0 /src/lib/corelib/jsextensions | |
| parent | cf2116b63a052bfcd7546bec56f66a5015cf5c51 (diff) | |
Clean up LanguageInfo
Delete the constructor, change the functions' return types to more
appropriate ones, don't export a Qt dependency, and move the Qbs version
from the Version POD class into LanguageInfo.
Change-Id: I2fc3fd41de60962ee244d525572882e191195c4b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/jsextensions')
| -rw-r--r-- | src/lib/corelib/jsextensions/utilitiesextension.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/corelib/jsextensions/utilitiesextension.cpp b/src/lib/corelib/jsextensions/utilitiesextension.cpp index e1d9d383f..c10707481 100644 --- a/src/lib/corelib/jsextensions/utilitiesextension.cpp +++ b/src/lib/corelib/jsextensions/utilitiesextension.cpp @@ -541,7 +541,7 @@ QScriptValue UtilitiesExtension::js_versionCompare(QScriptContext *context, QScr QScriptValue UtilitiesExtension::js_qmlTypeInfo(QScriptContext *context, QScriptEngine *engine) { Q_UNUSED(context); - return engine->toScriptValue(QString::fromUtf8(qbs::LanguageInfo().qmlTypeInfo())); + return engine->toScriptValue(QString::fromStdString(qbs::LanguageInfo::qmlTypeInfo())); } QScriptValue UtilitiesExtension::js_builtinExtensionNames(QScriptContext *context, |