summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/plugins/qmldesigner/qmldesignerprojectmanager.cpp20
1 files changed, 16 insertions, 4 deletions
diff --git a/src/plugins/qmldesigner/qmldesignerprojectmanager.cpp b/src/plugins/qmldesigner/qmldesignerprojectmanager.cpp
index 766b18af46..cf5a807037 100644
--- a/src/plugins/qmldesigner/qmldesignerprojectmanager.cpp
+++ b/src/plugins/qmldesigner/qmldesignerprojectmanager.cpp
@@ -185,11 +185,11 @@ public:
std::unique_ptr<ProjectStorageData> createProjectStorageData(::ProjectExplorer::Project *project)
{
- if (qEnvironmentVariableIsSet("QDS_ACTIVATE_PROJECT_STORAGE")) {
+ if constexpr (useProjectStorage()) {
return std::make_unique<ProjectStorageData>(project);
+ } else {
+ return {};
}
-
- return {};
}
} // namespace
@@ -262,9 +262,21 @@ AsynchronousImageCache &QmlDesignerProjectManager::asynchronousImageCache()
return imageCacheData()->asynchronousImageCache;
}
+namespace {
+ProjectStorage<Sqlite::Database> *dummyProjectStorage()
+{
+ return nullptr;
+}
+
+} // namespace
+
ProjectStorage<Sqlite::Database> &QmlDesignerProjectManager::projectStorage()
{
- return m_projectData->projectStorageData->storage;
+ if constexpr (useProjectStorage()) {
+ return m_projectData->projectStorageData->storage;
+ } else {
+ return *dummyProjectStorage();
+ }
}
void QmlDesignerProjectManager::editorOpened(::Core::IEditor *) {}