1 files changed, 7 insertions, 6 deletions
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp
index a4763c3333..2f54359458 100644
--- a/src/plugins/cpptools/cppfilesettingspage.cpp
+++ b/src/plugins/cpptools/cppfilesettingspage.cpp
@@ -39,16 +39,17 @@
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/mimetypes/mimedatabase.h>
+#include <utils/stringutils.h>
 
-#include <QSettings>
-#include <QDebug>
-#include <QFile>
 #include <QCoreApplication>
 #include <QDate>
+#include <QDebug>
+#include <QFile>
+#include <QFileDialog>
 #include <QLocale>
+#include <QSettings>
 #include <QTextCodec>
 #include <QTextStream>
-#include <QFileDialog>
 
 namespace CppTools {
 namespace Internal {
@@ -297,7 +298,7 @@ CppFileSettingsWidget::CppFileSettingsWidget(CppFileSettings *settings)
 
 QString CppFileSettingsWidget::licenseTemplatePath() const
 {
-    return m_ui.licenseTemplatePathChooser->path();
+    return m_ui.licenseTemplatePathChooser->filePath().toString();
 }
 
 void CppFileSettingsWidget::setLicenseTemplatePath(const QString &lp)
@@ -308,7 +309,7 @@ void CppFileSettingsWidget::setLicenseTemplatePath(const QString &lp)
 static QStringList trimmedPaths(const QString &paths)
 {
     QStringList res;
-    foreach (const QString &path, paths.split(QLatin1Char(','), QString::SkipEmptyParts))
+    foreach (const QString &path, paths.split(QLatin1Char(','), Utils::SkipEmptyParts))
         res << path.trimmed();
     return res;
 }