From 1b50cdce5ce91b6e00bd494746e24b6d5da9d7eb Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Thu, 15 Mar 2012 11:45:05 +0100
Subject: [PATCH] WelcomePage: turning widgets into a proper plugin

Change-Id: Ifffaa8f848777f6961b49dff048672b194570fff
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
---
 share/qtcreator/welcomescreen/develop.qml     |  2 +-
 share/qtcreator/welcomescreen/examples.qml    |  2 +-
 .../welcomescreen/gettingstarted.qml          |  2 +-
 share/qtcreator/welcomescreen/tutorials.qml   |  2 +-
 .../qtcreator/welcomescreen/welcomescreen.qml |  2 +-
 .../welcomescreen/welcomescreen.qmlproject    |  4 ++++
 share/qtcreator/welcomescreen/widgets/qmldir  | 19 +++++++++++++++++++
 src/plugins/welcome/welcomeplugin.cpp         |  3 +++
 8 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 share/qtcreator/welcomescreen/widgets/qmldir

diff --git a/share/qtcreator/welcomescreen/develop.qml b/share/qtcreator/welcomescreen/develop.qml
index 0dac47a8833..5136d08a501 100644
--- a/share/qtcreator/welcomescreen/develop.qml
+++ b/share/qtcreator/welcomescreen/develop.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.1
-import "widgets"
+import widgets 1.0
 
 Rectangle {
     id: rectangle1
diff --git a/share/qtcreator/welcomescreen/examples.qml b/share/qtcreator/welcomescreen/examples.qml
index 47a8f219fcc..63bc597e18f 100644
--- a/share/qtcreator/welcomescreen/examples.qml
+++ b/share/qtcreator/welcomescreen/examples.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import "widgets"
+import widgets 1.0
 
 Rectangle {
     id: rectangle1
diff --git a/share/qtcreator/welcomescreen/gettingstarted.qml b/share/qtcreator/welcomescreen/gettingstarted.qml
index 88d2e45e17d..1249374213d 100644
--- a/share/qtcreator/welcomescreen/gettingstarted.qml
+++ b/share/qtcreator/welcomescreen/gettingstarted.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.1
-import "widgets"
+import widgets 1.0
 
 Rectangle {
     id: gettingStartedRoot
diff --git a/share/qtcreator/welcomescreen/tutorials.qml b/share/qtcreator/welcomescreen/tutorials.qml
index c04a1f5351a..71f4346f826 100644
--- a/share/qtcreator/welcomescreen/tutorials.qml
+++ b/share/qtcreator/welcomescreen/tutorials.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import "widgets"
+import widgets 1.0
 
 Rectangle {
     id: rectangle1
diff --git a/share/qtcreator/welcomescreen/welcomescreen.qml b/share/qtcreator/welcomescreen/welcomescreen.qml
index 03271649b2f..bfbb08df951 100644
--- a/share/qtcreator/welcomescreen/welcomescreen.qml
+++ b/share/qtcreator/welcomescreen/welcomescreen.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import "widgets"
+import widgets 1.0
 
 Rectangle {
     width: 920
diff --git a/share/qtcreator/welcomescreen/welcomescreen.qmlproject b/share/qtcreator/welcomescreen/welcomescreen.qmlproject
index 5f8a07bb704..4132c632bca 100644
--- a/share/qtcreator/welcomescreen/welcomescreen.qmlproject
+++ b/share/qtcreator/welcomescreen/welcomescreen.qmlproject
@@ -15,6 +15,10 @@ Project {
     ImageFiles {
         directory: "."
     }
+    importPaths: {
+        directory: "."
+    }
+
     /* List of plugin directories passed to QML runtime */
     // importPaths: [ "../exampleplugin" ]
 }
diff --git a/share/qtcreator/welcomescreen/widgets/qmldir b/share/qtcreator/welcomescreen/widgets/qmldir
new file mode 100644
index 00000000000..5a2c93ecb83
--- /dev/null
+++ b/share/qtcreator/welcomescreen/widgets/qmldir
@@ -0,0 +1,19 @@
+CustomColors 1.0 CustomColors.qml
+GettingStartedItem 1.0 GettingStartedItem.qml
+ProjectItem 1.0 ProjectItem.qml
+CustomFonts 1.0 CustomFonts.qml
+LinkedText 1.0 LinkedText.qml
+RecentProjects 1.0 RecentProjects.qml
+CustomizedGridView 1.0 CustomizedGridView.qml
+LinksBar 1.0 LinksBar.qml
+SearchBar 1.0 SearchBar.qml
+CustomTab 1.0 CustomTab.qml
+Logo 1.0 Logo.qml
+SessionItem 1.0 SessionItem.qml
+Delegate 1.0 Delegate.qml
+PageCaption 1.0 PageCaption.qml
+Sessions 1.0 Sessions.qml
+Feedback 1.0 Feedback.qml
+PageLoader 1.0 PageLoader.qml
+ToolTip 1.0 ToolTip.qml
+
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index 37e23f27092..321d70b5041 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -234,6 +234,9 @@ void WelcomeMode::initPlugins()
 
 
     QDeclarativeEngine *engine = m_welcomePage->engine();
+    QStringList importPathList = engine->importPathList();
+    importPathList << Core::ICore::resourcePath() + QLatin1String("/welcomescreen");
+    engine->setImportPathList(importPathList);
     if (!debug)
         engine->setOutputWarningsToStandardError(false);
     engine->setNetworkAccessManagerFactory(new NetworkAccessManagerFactory);