From b18ef1ffb240506368459845fe1b9e932a49b44c Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Thu, 30 Jun 2011 13:53:36 +0200
Subject: [PATCH] WelcomeScreen: fix components imports on Windows

The path-based loader in QML is broken there.

Change-Id: I390370ca098e288f6e241c526e068a70f17d676f
Reviewed-on: http://codereview.qt.nokia.com/947
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
---
 share/qtcreator/welcomescreen/develop.qml                 | 8 ++++----
 share/qtcreator/welcomescreen/gettingstarted.qml          | 4 ++--
 share/qtcreator/welcomescreen/welcomescreen.pro           | 2 ++
 share/qtcreator/welcomescreen/welcomescreen.qml           | 2 +-
 share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml  | 2 +-
 .../welcomescreen/widgets/FeaturedAndNewsListing.qml      | 3 ++-
 share/qtcreator/welcomescreen/widgets/Feedback.qml        | 4 ++--
 share/qtcreator/welcomescreen/widgets/HeaderItemView.qml  | 1 +
 share/qtcreator/welcomescreen/widgets/LinksBar.qml        | 1 -
 share/qtcreator/welcomescreen/widgets/RecentProjects.qml  | 2 +-
 share/qtcreator/welcomescreen/widgets/RecentSessions.qml  | 2 +-
 src/plugins/welcome/welcomeplugin.cpp                     | 1 +
 12 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/share/qtcreator/welcomescreen/develop.qml b/share/qtcreator/welcomescreen/develop.qml
index 7473c789570..5f6fac3d2b2 100644
--- a/share/qtcreator/welcomescreen/develop.qml
+++ b/share/qtcreator/welcomescreen/develop.qml
@@ -1,6 +1,6 @@
 import QtQuick 1.0
-import "widgets"
-import "components" as Components
+import "widgets" as Widgets
+import components 1.0 as Components
 
 Item {
     id: root
@@ -11,12 +11,12 @@ Item {
         Item {
             height: Math.max(recentSessions.height, recentProjects.height)
             width: root.width-40
-            RecentSessions {
+            Widgets.RecentSessions {
                 id: recentSessions
                 x: 10
                 width: parent.width / 2 - 10
             }
-            RecentProjects {
+            Widgets.RecentProjects {
                 id: recentProjects
                 x: parent.width / 2 + 10
                 width: parent.width / 2 - 10
diff --git a/share/qtcreator/welcomescreen/gettingstarted.qml b/share/qtcreator/welcomescreen/gettingstarted.qml
index bb712c0c2a0..20902118f45 100644
--- a/share/qtcreator/welcomescreen/gettingstarted.qml
+++ b/share/qtcreator/welcomescreen/gettingstarted.qml
@@ -1,4 +1,4 @@
 import QtQuick 1.0
-import "widgets"
+import "widgets" as Widgets
 
-ExampleBrowser {}
+Widgets.ExampleBrowser {}
diff --git a/share/qtcreator/welcomescreen/welcomescreen.pro b/share/qtcreator/welcomescreen/welcomescreen.pro
index 0e9ebeb25c3..17ffa689110 100644
--- a/share/qtcreator/welcomescreen/welcomescreen.pro
+++ b/share/qtcreator/welcomescreen/welcomescreen.pro
@@ -1,6 +1,8 @@
 TEMPLATE = subdirs
 SUBDIRS = components/styleitem
 
+QML_IMPORT_PATH += $$OUT_PWD
+
 OTHER_FILES = develop.qml \
               gettingstarted.qml \
               newssupport.qml \
diff --git a/share/qtcreator/welcomescreen/welcomescreen.qml b/share/qtcreator/welcomescreen/welcomescreen.qml
index f52564f7239..845a2f960c3 100644
--- a/share/qtcreator/welcomescreen/welcomescreen.qml
+++ b/share/qtcreator/welcomescreen/welcomescreen.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
 import "widgets"
 
 Image {
diff --git a/share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml b/share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml
index 94700c409db..e91185144a6 100644
--- a/share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml
+++ b/share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml
@@ -1,5 +1,5 @@
 import QtQuick 1.0
-import "../components" as Components
+import components 1.0 as Components
 
 Item {
     id: exampleBrowserRoot
diff --git a/share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml b/share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml
index d6694c945a5..d8a3bad22e4 100644
--- a/share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml
+++ b/share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml
@@ -1,5 +1,6 @@
 import QtQuick 1.0
-import "../components" as Components
+import components 1.0 as Components
+
 Item {
     InsetText {
         id: text
diff --git a/share/qtcreator/welcomescreen/widgets/Feedback.qml b/share/qtcreator/welcomescreen/widgets/Feedback.qml
index 64a3904341a..839e9cbeb42 100644
--- a/share/qtcreator/welcomescreen/widgets/Feedback.qml
+++ b/share/qtcreator/welcomescreen/widgets/Feedback.qml
@@ -1,5 +1,5 @@
-import Qt 4.7
-import "../components" as Components
+import QtQuick 1.0
+import components 1.0 as Components
 
 BorderImage {
     id: inner_background
diff --git a/share/qtcreator/welcomescreen/widgets/HeaderItemView.qml b/share/qtcreator/welcomescreen/widgets/HeaderItemView.qml
index 1ac0079b113..23c0466daaf 100644
--- a/share/qtcreator/welcomescreen/widgets/HeaderItemView.qml
+++ b/share/qtcreator/welcomescreen/widgets/HeaderItemView.qml
@@ -1,4 +1,5 @@
 import QtQuick 1.0
+
 Item {
     id: root
     height: childrenRect.height
diff --git a/share/qtcreator/welcomescreen/widgets/LinksBar.qml b/share/qtcreator/welcomescreen/widgets/LinksBar.qml
index a4efb7495c5..e357c17393f 100644
--- a/share/qtcreator/welcomescreen/widgets/LinksBar.qml
+++ b/share/qtcreator/welcomescreen/widgets/LinksBar.qml
@@ -1,6 +1,5 @@
 import QtQuick 1.0
 
-
 Row {
     id: tabBar
     height: 25
diff --git a/share/qtcreator/welcomescreen/widgets/RecentProjects.qml b/share/qtcreator/welcomescreen/widgets/RecentProjects.qml
index 8a9bab30fcc..8f67ca20c04 100644
--- a/share/qtcreator/welcomescreen/widgets/RecentProjects.qml
+++ b/share/qtcreator/welcomescreen/widgets/RecentProjects.qml
@@ -1,5 +1,5 @@
 import QtQuick 1.0
-import "../components" as Components
+import components 1.0 as Components
 
 HeaderItemView {
     header: qsTr("Recently Edited Projects")
diff --git a/share/qtcreator/welcomescreen/widgets/RecentSessions.qml b/share/qtcreator/welcomescreen/widgets/RecentSessions.qml
index 68fb74cf33e..64472cb9b45 100644
--- a/share/qtcreator/welcomescreen/widgets/RecentSessions.qml
+++ b/share/qtcreator/welcomescreen/widgets/RecentSessions.qml
@@ -1,5 +1,5 @@
 import QtQuick 1.0
-import "../components" as Components
+import components 1.0 as Components
 
 HeaderItemView {
     header: qsTr("Recently Used Sessions")
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index 2c6e2b6e6e8..d4ef9148bb9 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -182,6 +182,7 @@ void WelcomeMode::initPlugins()
 
     QDeclarativeEngine *engine = m_welcomePage->engine();
     engine->setNetworkAccessManagerFactory(new NetworkAccessManagerFactory);
+    engine->addImportPath(Core::ICore::instance()->resourcePath() + "/welcomescreen");
     foreach (Utils::IWelcomePage *plugin, plugins) {
         plugin->facilitateQml(engine);
         m_pluginList.append(plugin);