1 files changed, 8 insertions, 6 deletions
diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
index 6c5c6cdb3a..f6af2ca02c 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
@@ -29,12 +29,13 @@
 #include <coreplugin/icore.h>
 #include <cpptools/cpptoolsconstants.h>
 
-#include <utils/mimetypes/mimedatabase.h>
 #include <utils/macroexpander.h>
+#include <utils/mimetypes/mimedatabase.h>
+#include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 #include <utils/templateengine.h>
 #include <utils/temporarydirectory.h>
 #include <utils/temporaryfile.h>
-#include <utils/qtcassert.h>
 
 #include <QCoreApplication>
 #include <QDate>
@@ -50,6 +51,7 @@
 enum { debug = 0 };
 
 using namespace Core;
+using namespace Utils;
 
 static const char customWizardElementC[] = "wizard";
 static const char iconElementC[] = "icon";
@@ -450,7 +452,7 @@ static inline IWizardFactory::WizardKind kindAttribute(const QXmlStreamReader &r
 static inline QSet<Id> readRequiredFeatures(const QXmlStreamReader &reader)
 {
     QString value = reader.attributes().value(QLatin1String(featuresRequiredC)).toString();
-    QStringList stringList = value.split(QLatin1Char(','), QString::SkipEmptyParts);
+    QStringList stringList = value.split(QLatin1Char(','), Utils::SkipEmptyParts);
     QSet<Id> features;
     foreach (const QString &string, stringList)
         features |= Id::fromString(string);
@@ -571,7 +573,7 @@ CustomWizardParameters::parse(QIODevice &device, const QString &configFileFullPa
                     {
                         const QString idString = attributeValue(reader, idAttributeC);
                         if (!idString.isEmpty())
-                            id = Core::Id::fromString(idString);
+                            id = Utils::Id::fromString(idString);
                     }
                     category = attributeValue(reader, categoryAttributeC);
                     kind = kindAttribute(reader);
@@ -921,9 +923,9 @@ void CustomWizardContext::reset()
     baseReplacements.insert(QLatin1String("CurrentTime:RFC"),
                             currentTime.toString(Qt::RFC2822Date));
     baseReplacements.insert(QLatin1String("CurrentDate:Locale"),
-                            currentDate.toString(Qt::DefaultLocaleShortDate));
+                            QLocale::system().toString(currentDate, QLocale::ShortFormat));
     baseReplacements.insert(QLatin1String("CurrentTime:Locale"),
-                            currentTime.toString(Qt::DefaultLocaleShortDate));
+                            QLocale::system().toString(currentTime, QLocale::ShortFormat));
     replacements.clear();
     path.clear();
     targetPath.clear();