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

Fix Wizard page not offering the right project to add to.

Browse Source 
Symptom of file name slashification breakage.

Reviewed-by: dt
Task-number: QTCREATORBUG-2535
This commit is contained in:
Friedemann Kleint
2010-09-30 16:50:59 +02:00
parent 5e59605c1e
commit 111c18e353
5 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/projectexplorer/customwizard/customwizard.cpp
View File

@@ -148,7 +148,7 @@ static inline bool createFile(Internal::CustomWizardFile cwFile,
const QString sourcePath = sourceDirectory + slash + cwFile.source;
// Field replacement on target path
Internal::CustomWizardContext::replaceFields(fm, &cwFile.target);
const QString targetPath = QDir::toNativeSeparators(targetDirectory + slash + cwFile.target);
const QString targetPath = targetDirectory + slash + cwFile.target;
if (CustomWizardPrivate::verbose)
qDebug() << "generating " << targetPath << sourcePath << fm;
@@ -533,7 +533,8 @@ bool CustomProjectWizard::postGenerateOpen(const Core::GeneratedFiles &l, QStrin
if (file.attributes() & Core::GeneratedFile::OpenProjectAttribute) {
if (!ProjectExplorer::ProjectExplorerPlugin::instance()->openProject(file.path())) {
if (errorMessage)
*errorMessage = tr("The project %1 could not be opened.").arg(file.path());
*errorMessage = tr("The project %1 could not be opened.").
arg(QDir::toNativeSeparators(file.path()));
return false;
}
}