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/libs/utils/json.h | |
| 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/libs/utils/json.h')
| -rw-r--r-- | src/libs/utils/json.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/libs/utils/json.h b/src/libs/utils/json.h index 9edc9dbae4c..7cca396740a 100644 --- a/src/libs/utils/json.h +++ b/src/libs/utils/json.h @@ -355,28 +355,28 @@ private: static bool maybeSchemaName(const QString &s); - static const QString kType; - static const QString kProperties; - static const QString kPatternProperties; - static const QString kAdditionalProperties; - static const QString kItems; - static const QString kAdditionalItems; - static const QString kRequired; - static const QString kDependencies; - static const QString kMinimum; - static const QString kMaximum; - static const QString kExclusiveMinimum; - static const QString kExclusiveMaximum; - static const QString kMinItems; - static const QString kMaxItems; - static const QString kUniqueItems; - static const QString kPattern; - static const QString kMinLength; - static const QString kMaxLength; - static const QString kTitle; - static const QString kDescription; - static const QString kExtends; - static const QString kRef; + static QString kType(); + static QString kProperties(); + static QString kPatternProperties(); + static QString kAdditionalProperties(); + static QString kItems(); + static QString kAdditionalItems(); + static QString kRequired(); + static QString kDependencies(); + static QString kMinimum(); + static QString kMaximum(); + static QString kExclusiveMinimum(); + static QString kExclusiveMaximum(); + static QString kMinItems(); + static QString kMaxItems(); + static QString kUniqueItems(); + static QString kPattern(); + static QString kMinLength(); + static QString kMaxLength(); + static QString kTitle(); + static QString kDescription(); + static QString kExtends(); + static QString kRef(); struct Context { |