diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-11-19 17:01:08 +0100 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-11-21 22:18:35 +0200 |
| commit | 4e6142c93226862458252da84a5ce0539e6008ae (patch) | |
| tree | a75c38085df5769e21e11c3b6c5b0b774434c9f2 /src/plugins/perfprofiler | |
| parent | fd8afd564f847f24ad119fd519929de6dcb94139 (diff) | |
| parent | e53e0a808b5d0075c95fd7635ce53cc4de277f3a (diff) | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
src/plugins/autotest/testresultspane.cpp
src/plugins/cmakeprojectmanager/cmaketool.cpp
Change-Id: Iade695ac9cab8bf3e3a1abd6e2c71f4a19132ac0
Diffstat (limited to 'src/plugins/perfprofiler')
| -rw-r--r-- | src/plugins/perfprofiler/perfloaddialog.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/perfprofiler/perfloaddialog.cpp b/src/plugins/perfprofiler/perfloaddialog.cpp index a88c57ae64..b0602ed725 100644 --- a/src/plugins/perfprofiler/perfloaddialog.cpp +++ b/src/plugins/perfprofiler/perfloaddialog.cpp @@ -106,11 +106,8 @@ void PerfLoadDialog::chooseDefaults() ui->kitChooser->setCurrentKitId(target->kit()->id()); - ProjectExplorer::BuildConfiguration *buildConfig = target->activeBuildConfiguration(); - if (!buildConfig) - return; - - ui->executableDirLineEdit->setText(buildConfig->buildDirectory().toString()); + if (auto *bc = target->activeBuildConfiguration()) + ui->executableDirLineEdit->setText(bc->buildDirectory().toString()); } } // namespace Internal |