summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2021-03-02 20:41:52 +0300
committerIvan Komissarov <ABBAPOH@gmail.com>2021-03-03 16:56:55 +0000
commitea8147d3b1aa38da583affd7f9d988e66bdc7807 (patch)
tree5954614d2b4d9e295c94c0057c77399160a09193 /src
parent1371c4479cca8cea5d8bbfddd1b625569935152a (diff)
downloadqbs-ea8147d3b1aa38da583affd7f9d988e66bdc7807.tar.gz
qt6: fix deprecation warning about QScopedPointer::take
Use std::unique_ptr instead, and call release(). Change-Id: Ic3f224a5e29ba3b1d6e9a0490b29a801265dfafd Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/lib/corelib/language/moduleloader.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index b059976be..c0bc6a894 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -644,7 +644,7 @@ void ModuleLoader::handleProject(ModuleLoaderResult *loadResult,
TopLevelProjectContext *topLevelProjectContext, Item *projectItem,
const Set<QString> &referencedFilePaths)
{
- QScopedPointer<ProjectContext> p(new ProjectContext);
+ auto p = std::make_unique<ProjectContext>();
auto &projectContext = *p;
projectContext.topLevelProject = topLevelProjectContext;
projectContext.result = loadResult;
@@ -672,8 +672,7 @@ void ModuleLoader::handleProject(ModuleLoaderResult *loadResult,
m_disabledProjects.insert(projectContext.name);
return;
}
- p.take();
- topLevelProjectContext->projects.push_back(&projectContext);
+ topLevelProjectContext->projects.push_back(p.release());
m_reader->pushExtraSearchPaths(readExtraSearchPaths(projectItem)
<< projectItem->file()->dirPath());
projectContext.searchPathsStack = m_reader->extraSearchPathsStack();