diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2023-06-02 21:23:26 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2023-06-02 19:26:05 +0000 |
| commit | 002d84cb15e314a207346fdfd6cf78055d1b8b92 (patch) | |
| tree | f3354186e1b3f7e80a2786acfaff6656eb7cdb09 /src/plugins/qnx/qnxdebugsupport.cpp | |
| parent | bc6487068892be8c99404998c93dc6125551cf18 (diff) | |
| parent | e759ce310fe6f30724f29b809bf0bcab1df88e1d (diff) | |
Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts: src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp
Change-Id: I257f1908917bcc58805619b53b6866f2f73ca544
Diffstat (limited to 'src/plugins/qnx/qnxdebugsupport.cpp')
| -rw-r--r-- | src/plugins/qnx/qnxdebugsupport.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp index cb3932daab5..919e9ef1fcc 100644 --- a/src/plugins/qnx/qnxdebugsupport.cpp +++ b/src/plugins/qnx/qnxdebugsupport.cpp @@ -21,8 +21,8 @@ #include <projectexplorer/kitchooser.h> #include <projectexplorer/kitinformation.h> #include <projectexplorer/projectexplorer.h> +#include <projectexplorer/projectmanager.h> #include <projectexplorer/runconfigurationaspects.h> -#include <projectexplorer/session.h> #include <projectexplorer/target.h> #include <projectexplorer/toolchain.h> @@ -33,9 +33,9 @@ #include <utils/fileutils.h> #include <utils/pathchooser.h> #include <utils/portlist.h> +#include <utils/process.h> #include <utils/processinfo.h> #include <utils/qtcassert.h> -#include <utils/qtcprocess.h> #include <QDir> #include <QFormLayout> @@ -223,7 +223,7 @@ void showAttachToProcessDialog() return; // FIXME: That should be somehow related to the selected kit. - auto runConfig = SessionManager::startupRunConfiguration(); + auto runConfig = ProjectManager::startupRunConfiguration(); const int pid = dlg.currentProcess().processId; // QString projectSourceDirectory = dlg.projectSource(); |