1 files changed, 15 insertions, 9 deletions
diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp
index 9cd065bf73..24ead38f09 100644
--- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp
+++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp
@@ -55,7 +55,7 @@
 #include <QMutex>
 #include <QThread>
 #include <QMutexLocker>
-#include <QWeakPointer>
+#include <QPointer>
 #include <QWaitCondition>
 #include <QDir>
 #include <QBuffer>
@@ -75,20 +75,23 @@
 #include <QDeclarativeContext>
 #include <QDesktopServices>
 
+using namespace Utils;
+
 namespace QtSupport {
 namespace Internal {
 
 const char C_FALLBACK_ROOT[] = "ProjectsFallbackRoot";
 
-QWeakPointer<ExamplesListModel> &examplesModelStatic()
+QPointer<ExamplesListModel> &examplesModelStatic()
 {
-    static QWeakPointer<ExamplesListModel> s_examplesModel;
+    static QPointer<ExamplesListModel> s_examplesModel;
     return s_examplesModel;
 }
 
 class Fetcher : public QObject
 {
     Q_OBJECT
+
 public:
     Fetcher() : QObject(),  m_shutdown(false)
     {
@@ -179,7 +182,7 @@ public:
         Q_UNUSED(size)
         QMutexLocker lock(&m_mutex);
 
-        QUrl url = QUrl::fromEncoded(id.toAscii());
+        QUrl url = QUrl::fromEncoded(id.toLatin1());
 
         if (!m_fetcher.asynchronousFetchData(url))
             return QImage();
@@ -351,9 +354,9 @@ QString ExamplesWelcomePage::copyToAlternativeLocation(const QFileInfo& proFileI
                       .arg(nativeProjectDir));
     lay->addWidget(descrLbl, 0, 0, 1, 2);
     QLabel *txt = new QLabel(tr("&Location:"));
-    Utils::PathChooser *chooser = new Utils::PathChooser;
+    PathChooser *chooser = new PathChooser;
     txt->setBuddy(chooser);
-    chooser->setExpectedKind(Utils::PathChooser::ExistingDirectory);
+    chooser->setExpectedKind(PathChooser::ExistingDirectory);
     QSettings *settings = Core::ICore::settings();
     chooser->setPath(settings->value(QString::fromLatin1(C_FALLBACK_ROOT),
                                      Core::DocumentManager::projectsDirectory()).toString());
@@ -382,15 +385,18 @@ QString ExamplesWelcomePage::copyToAlternativeLocation(const QFileInfo& proFileI
         } else {
             QString error;
             QString targetDir = destBaseDir + QLatin1Char('/') + exampleDirName;
-            if (Utils::FileUtils::copyRecursively(projectDir, targetDir, &error)) {
+            if (FileUtils::copyRecursively(FileName::fromString(projectDir),
+                    FileName::fromString(targetDir), &error)) {
                 // set vars to new location
                 const QStringList::Iterator end = filesToOpen.end();
                 for (QStringList::Iterator it = filesToOpen.begin(); it != end; ++it)
                     it->replace(projectDir, targetDir);
 
                 foreach (const QString &dependency, dependencies) {
-                    QString dirName = QDir(dependency).dirName();
-                    if (!Utils::FileUtils::copyRecursively(dependency, targetDir + QDir::separator()+ dirName, &error)) {
+                    FileName targetFile = FileName::fromString(targetDir);
+                    targetFile.appendPath(QDir(dependency).dirName());
+                    if (!FileUtils::copyRecursively(FileName::fromString(dependency), targetFile,
+                            &error)) {
                         QMessageBox::warning(Core::ICore::mainWindow(), tr("Cannot Copy Project"), error);
                         // do not fail, just warn;
                     }