summaryrefslogtreecommitdiff
path: root/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp')
-rw-r--r--src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp
index fda0e1192d..d338bf3a29 100644
--- a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp
@@ -44,7 +44,6 @@
#include <QCoreApplication>
#include <QDir>
#include <QTextStream>
-#include <QFileInfo>
#include <QSharedPointer>
static const char mainSourceFileC[] = "main";
@@ -195,11 +194,11 @@ Core::GeneratedFiles GuiAppWizard::generateFiles(const QWizard *w,
QTextStream proStr(&contents);
QtProjectParameters::writeProFileHeader(proStr);
projectParams.writeProFile(proStr);
- proStr << "\n\nSOURCES += " << QFileInfo(mainSourceFileName).fileName()
- << "\\\n " << QFileInfo(formSource.path()).fileName()
- << "\n\nHEADERS += " << QFileInfo(formHeader.path()).fileName();
+ proStr << "\n\nSOURCES += " << Utils::FileName::fromString(mainSourceFileName).fileName()
+ << "\\\n " << Utils::FileName::fromString(formSource.path()).fileName()
+ << "\n\nHEADERS += " << Utils::FileName::fromString(formHeader.path()).fileName();
if (params.designerForm)
- proStr << "\n\nFORMS += " << QFileInfo(form->path()).fileName();
+ proStr << "\n\nFORMS += " << Utils::FileName::fromString(form->path()).fileName();
if (params.isMobileApplication) {
proStr << "\n\nCONFIG += mobility"
<< "\nMOBILITY = "
@@ -221,9 +220,7 @@ bool GuiAppWizard::parametrizeTemplate(const QString &templatePath, const QStrin
const GuiAppParameters &params,
QString *target, QString *errorMessage)
{
- QString fileName = templatePath;
- fileName += QDir::separator();
- fileName += templateName;
+ const QString fileName = templatePath + QLatin1Char('/') + templateName;
Utils::FileReader reader;
if (!reader.fetch(fileName, QIODevice::Text, errorMessage))
return false;