diff options
author | Aleix Pol <aleixpol@kde.org> | 2015-10-09 13:33:27 +0200 |
---|---|---|
committer | Aleix Pol Gonzalez <aleixpol@kde.org> | 2015-10-09 17:09:45 +0000 |
commit | b899684a89b2c6880cf346b3ea24d5705fdf42ff (patch) | |
tree | c1deb0386adb472adc460fea602bf30872ed967f /src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | |
parent | 954cabdde87dde25eb88b6dcf8b9352f2e37da13 (diff) |
Don't put QString in static attributes
It crashed in some places on our code-base due to the so-called "static
initialization order fiasco".
As a solution, it turns the variable into a function. This shouldn't have
a penalty due to QStringLiteral.
Change-Id: I9f8a955afdff878dc2f0db16fec861d81250c243
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp')
-rw-r--r-- | src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index bb826bbf27..493f762afd 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -154,7 +154,7 @@ static QString qualifiedTypeNameForContext(const ObjectValue *objectValue, case ImportType::Library: { QString typeName = objectValue->className(); - if (!e.typeName.isEmpty() && e.typeName != Export::LibraryTypeName) { + if (!e.typeName.isEmpty() && e.typeName != Export::libraryTypeName()) { typeName = e.typeName; if (typeName != objectValue->className()) qCWarning(qmljsLog) << "Outdated classname " << objectValue->className() |