diff options
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakeproject.cpp')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeproject.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index b4ed6335e0..7da38ea3f9 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -89,8 +89,8 @@ QmakeBuildConfiguration *enableActiveQmakeBuildConfiguration(ProjectExplorer::Ta void updateBoilerPlateCodeFiles(const AbstractMobileApp *app, const QString &proFile) { - const QList<AbstractGeneratedFileInfo> updates = - app->fileUpdates(proFile); + const QList<AbstractGeneratedFileInfo> updates = app->fileUpdates(proFile); + const QString nativeProFile = QDir::toNativeSeparators(proFile); if (!updates.empty()) { const QString title = QmakeManager::tr("Update of Generated Files"); QStringList fileNames; @@ -100,7 +100,7 @@ void updateBoilerPlateCodeFiles(const AbstractMobileApp *app, const QString &pro QmakeManager::tr("In project<br><br>%1<br><br>The following files are either " "outdated or have been modified:<br><br>%2<br><br>Do you want " "Qt Creator to update the files? Any changes will be lost.") - .arg(proFile, fileNames.join(QLatin1String(", "))); + .arg(nativeProFile, fileNames.join(QLatin1String(", "))); if (QMessageBox::question(0, title, message, QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) { QString error; if (!app->updateFiles(updates, error)) @@ -528,7 +528,7 @@ void QmakeProject::updateCppCodeModel() SysRootKitInformation::sysRoot(k)); // part->defines - part->defines += pro->cxxDefines(); + part->projectDefines += pro->cxxDefines(); // part->includePaths, part->frameworkPaths part->includePaths.append(pro->variableValue(IncludePathVar)); |