From 704f3d539bc310cdd58aaa19613b297288774af8 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sat, 31 Jan 2015 22:11:59 +0200
Subject: [PATCH] Wizard: Use normalized path separators

Task-number: QTCREATORBUG-13903
Change-Id: Ie7fc4bbf793a6379dbb8410c6ec23a48504beed0
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
 src/plugins/coreplugin/basefilewizardfactory.cpp             | 5 +++--
 src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp     | 4 +---
 .../qmakeprojectmanager/wizards/qtprojectparameters.cpp      | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/plugins/coreplugin/basefilewizardfactory.cpp b/src/plugins/coreplugin/basefilewizardfactory.cpp
index 3e850fab75c..bd0711818ce 100644
--- a/src/plugins/coreplugin/basefilewizardfactory.cpp
+++ b/src/plugins/coreplugin/basefilewizardfactory.cpp
@@ -454,8 +454,9 @@ QString BaseFileWizardFactory::buildFileName(const QString &path,
                                       const QString &extension)
 {
     QString rc = path;
-    if (!rc.isEmpty() && !rc.endsWith(QDir::separator()))
-        rc += QDir::separator();
+    const QChar slash = QLatin1Char('/');
+    if (!rc.isEmpty() && !rc.endsWith(slash))
+        rc += slash;
     rc += baseName;
     // Add extension unless user specified something else
     const QChar dot = QLatin1Char('.');
diff --git a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp
index c68f41aca36..95ef6a74f4a 100644
--- a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp
@@ -220,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;
diff --git a/src/plugins/qmakeprojectmanager/wizards/qtprojectparameters.cpp b/src/plugins/qmakeprojectmanager/wizards/qtprojectparameters.cpp
index 5fa1c2d15f4..42e43607d5f 100644
--- a/src/plugins/qmakeprojectmanager/wizards/qtprojectparameters.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/qtprojectparameters.cpp
@@ -50,7 +50,7 @@ QString QtProjectParameters::projectPath() const
 {
     QString rc = path;
     if (!rc.isEmpty())
-        rc += QDir::separator();
+        rc += QLatin1Char('/');
     rc += fileName;
     return rc;
 }