feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Show native separators in CMakeRunPage

Browse Source 
Change-Id: Id82db707cbed96a125c3bc84375482873127ce99
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Robert Loehning
2015-10-27 15:45:27 +01:00
parent e51acff8fa
commit 5d588d4100
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
View File

@@ -61,6 +61,7 @@
#include <QStringList> #include <QStringList>
#include <QApplication> #include <QApplication>
#include <QCheckBox> #include <QCheckBox>
#include <QDir>
using namespace CMakeProjectManager; using namespace CMakeProjectManager;
using namespace CMakeProjectManager::Internal; using namespace CMakeProjectManager::Internal;
@@ -495,7 +496,7 @@ void CMakeRunPage::initializePage()
"You can add command line arguments below. Note that " "You can add command line arguments below. Note that "
"CMake remembers command line arguments from the " "CMake remembers command line arguments from the "
"previous runs.") "previous runs.")
.arg(m_buildDirectory) .arg(QDir::toNativeSeparators(m_buildDirectory))
.arg(m_buildConfigurationName) .arg(m_buildConfigurationName)
.arg(m_kitName)); .arg(m_kitName));
} else if (m_mode == CMakeRunPage::Recreate) { } else if (m_mode == CMakeRunPage::Recreate) {
@@ -505,7 +506,7 @@ void CMakeRunPage::initializePage()
"Some projects require command line arguments to " "Some projects require command line arguments to "
"the initial CMake call. Note that CMake remembers command " "the initial CMake call. Note that CMake remembers command "
"line arguments from the previous runs.") "line arguments from the previous runs.")
.arg(m_buildDirectory) .arg(QDir::toNativeSeparators(m_buildDirectory))
.arg(m_buildConfigurationName) .arg(m_buildConfigurationName)
.arg(m_kitName)); .arg(m_kitName));
} else if (m_mode == CMakeRunPage::ChangeDirectory) { } else if (m_mode == CMakeRunPage::ChangeDirectory) {
@@ -516,7 +517,7 @@ void CMakeRunPage::initializePage()
} else if (m_mode == CMakeRunPage::WantToUpdate) { } else if (m_mode == CMakeRunPage::WantToUpdate) {
m_descriptionLabel->setText(tr("Refreshing the .cbp file in \"%1\" for build configuration \"%2\" " m_descriptionLabel->setText(tr("Refreshing the .cbp file in \"%1\" for build configuration \"%2\" "
"for target \"%3\".") "for target \"%3\".")
.arg(m_buildDirectory) .arg(QDir::toNativeSeparators(m_buildDirectory))
.arg(m_buildConfigurationName) .arg(m_buildConfigurationName)
.arg(m_kitName)); .arg(m_kitName));
} }