diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index 8ee16141638..90035878533 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -214,16 +214,6 @@ void CdbEngine::init() m_symbolAddressCache.clear(); m_coreStopReason.reset(); - // Create local list of mappings in native separators - m_sourcePathMappings.clear(); - const QString &packageSources = runParameters().qtPackageSourceLocation; - if (!packageSources.isEmpty()) { - for (const QString &buildPath : qtBuildPaths()) { - m_sourcePathMappings.push_back({QDir::toNativeSeparators(buildPath), - QDir::toNativeSeparators(packageSources)}); - } - } - const SourcePathMap &sourcePathMap = mergePlatformQtPath(runParameters(), settings().sourcePathMap()); if (!sourcePathMap.isEmpty()) { diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index dfb623b4bc5..e82a386311d 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -160,7 +160,6 @@ public: QString startMessage; // First status message shown. Utils::FilePath debugInfoLocation; // Gdb "set-debug-file-directory". QStringList debugSourceLocation; // Gdb "directory" - QString qtPackageSourceLocation; Utils::FilePath qtSourceLocation; bool isSnapshot = false; // Set if created internally. ProjectExplorer::Abi toolChainAbi; diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index a242fa5b3f2..7971ea1beb8 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -847,10 +847,8 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, AllowTerminal allowTerm m_runParameters.cppEngineType = DebuggerKitAspect::engineType(kit); m_runParameters.version = DebuggerKitAspect::version(kit); - if (QtSupport::QtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(kit)) { - m_runParameters.qtPackageSourceLocation = qtVersion->qtPackageSourcePath().toString(); + if (QtSupport::QtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(kit)) m_runParameters.qtSourceLocation = qtVersion->sourcePath(); - } if (auto aspect = runControl->aspect()) { if (!aspect->useCppDebugger) diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index a62f0f997cf..fb28d16aa38 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -63,7 +63,6 @@ const char QTVERSIONAUTODETECTED[] = "isAutodetected"; const char QTVERSIONDETECTIONSOURCE[] = "autodetectionSource"; const char QTVERSION_OVERRIDE_FEATURES[] = "overrideFeatures"; const char QTVERSIONQMAKEPATH[] = "QMakePath"; -const char QTVERSIONSOURCEPATH[] = "SourcePath"; const char QTVERSION_ABIS[] = "Abis"; @@ -91,7 +90,6 @@ public: QString qtVersionString; FilePath sourcePath; - FilePath qtSources; Utils::FilePath prefix; @@ -148,7 +146,6 @@ public: result.insert("QtVersionString", qtVersionString); result.insert("SourcePath", sourcePath.toSettings()); - result.insert("QtSources", qtSources.toSettings()); result.insert("Prefix", prefix.toSettings()); result.insert("BinPath", binPath.toSettings()); result.insert("LibExecPath", libExecPath.toSettings()); @@ -187,7 +184,6 @@ public: unexpandedDisplayName.fromMap(map, "UnexpandedDisplayName"); qtVersionString = map.value("QtVersionString").toString(); sourcePath = FilePath::fromSettings(map.value("SourcePath")); - qtSources = FilePath::fromSettings(map.value("QtSources")); prefix = FilePath::fromSettings(map.value("Prefix")); binPath = FilePath::fromSettings(map.value("BinPath")); libExecPath = FilePath::fromSettings(map.value("LibExecPath")); @@ -769,8 +765,6 @@ void QtVersion::fromMap(const Store &map, const FilePath &filePath, bool forceRe if (persistentStore && !forceRefreshCache) d->m_data.fromMap(*persistentStore); - else - d->m_data.qtSources = FilePath::fromSettings(map.value(QTVERSIONSOURCEPATH)); Store::const_iterator itQtAbis = map.find(QTVERSION_ABIS); if (itQtAbis != map.end()) { @@ -1046,11 +1040,6 @@ FilePath QtVersion::sourcePath() const return d->m_data.sourcePath; } -FilePath QtVersion::qtPackageSourcePath() const -{ - return d->m_data.qtSources; -} - FilePath QtVersion::designerFilePath() const { if (!isValid()) diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index da961193c17..fa7f135ac51 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -86,8 +86,6 @@ public: // source path defined by qmake property QT_INSTALL_PREFIX/src or by qmake.stash QT_SOURCE_TREE Utils::FilePath sourcePath() const; - // returns source path for installed qt packages and empty string for self build qt - Utils::FilePath qtPackageSourcePath() const; bool isInQtSourceDirectory(const Utils::FilePath &filePath) const; bool isQtSubProject(const Utils::FilePath &filePath) const;