From d6c376e406260e0a71476474a6250029b9686c57 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Fri, 1 Jul 2011 16:29:55 +0200
Subject: [PATCH] WelcomeScreen: Use QUrl for page location

Silences warning from QtDeclarative in Qt 4.8

Change-Id: Iabab0988408b040fd590ebccb24f7fb59614ac8b
Reviewed-on: http://codereview.qt.nokia.com/1014
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
 src/libs/utils/iwelcomepage.h                     | 5 +++--
 src/plugins/projectexplorer/projectwelcomepage.h  | 2 +-
 src/plugins/qtsupport/gettingstartedwelcomepage.h | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/libs/utils/iwelcomepage.h b/src/libs/utils/iwelcomepage.h
index d2dd6129a1e..4363beb78e6 100644
--- a/src/libs/utils/iwelcomepage.h
+++ b/src/libs/utils/iwelcomepage.h
@@ -36,6 +36,7 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QMetaType>
+#include <QtCore/QUrl>
 
 #include "utils_global.h"
 
@@ -52,14 +53,14 @@ class QTCREATOR_UTILS_EXPORT IWelcomePage : public QObject
     Q_OBJECT
 
     Q_PROPERTY(QString title READ title CONSTANT)
-    Q_PROPERTY(QString pageLocation READ pageLocation CONSTANT)
+    Q_PROPERTY(QUrl pageLocation READ pageLocation CONSTANT)
     Q_PROPERTY(int priority READ priority CONSTANT)
 
 public:
     IWelcomePage();
     virtual ~IWelcomePage();
 
-    virtual QString pageLocation() const = 0;
+    virtual QUrl pageLocation() const = 0;
     virtual QString title() const = 0;
     virtual int priority() const { return 0; }
     virtual void facilitateQml(QDeclarativeEngine *) {}
diff --git a/src/plugins/projectexplorer/projectwelcomepage.h b/src/plugins/projectexplorer/projectwelcomepage.h
index 5b3d2da2cb0..f63009f8988 100644
--- a/src/plugins/projectexplorer/projectwelcomepage.h
+++ b/src/plugins/projectexplorer/projectwelcomepage.h
@@ -103,7 +103,7 @@ public:
     ProjectWelcomePage();
 
     void facilitateQml(QDeclarativeEngine *engine);
-    QString pageLocation() const { return Core::ICore::instance()->resourcePath() + QLatin1String("/welcomescreen/develop.qml"); }
+    QUrl pageLocation() const { return QUrl::fromLocalFile(Core::ICore::instance()->resourcePath() + QLatin1String("/welcomescreen/develop.qml")); }
     QWidget *page() { return 0; }
     QString title() const { return tr("Develop"); }
     int priority() const { return 20; }
diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.h b/src/plugins/qtsupport/gettingstartedwelcomepage.h
index 1c421d024ae..e77fdea3784 100644
--- a/src/plugins/qtsupport/gettingstartedwelcomepage.h
+++ b/src/plugins/qtsupport/gettingstartedwelcomepage.h
@@ -56,7 +56,7 @@ class GettingStartedWelcomePage : public Utils::IWelcomePage
 public:
     GettingStartedWelcomePage();
 
-    QString pageLocation() const { return Core::ICore::instance()->resourcePath() + QLatin1String("/welcomescreen/gettingstarted.qml"); }
+    QUrl pageLocation() const { return QUrl::fromLocalFile(Core::ICore::instance()->resourcePath() + QLatin1String("/welcomescreen/gettingstarted.qml")); }
     QString title() const { return tr("Getting Started");}
     int priority() const { return 10; }
     void facilitateQml(QDeclarativeEngine *);