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/cpptools/cppmodelmanager.cpp | |
| parent | 954cabdde87dde25eb88b6dcf8b9352f2e37da13 (diff) | |
| download | qt-creator-b899684a89b2c6880cf346b3ea24d5705fdf42ff.tar.gz | |
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/cpptools/cppmodelmanager.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index e15d1f659c..34f329af84 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -253,7 +253,7 @@ QString CppModelManager::editorConfigurationFileName() QString CppModelManager::configurationFileName() { - return Preprocessor::configurationFileName; + return Preprocessor::configurationFileName(); } void CppModelManager::updateModifiedSourceFiles() |