Commit b18ef1ff authored by Daniel Molkentin's avatar Daniel Molkentin

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/947Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarChristian Kamm <christian.d.kamm@nokia.com>
parent eb428718
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
......
import QtQuick 1.0
import "widgets"
import "widgets" as Widgets
ExampleBrowser {}
Widgets.ExampleBrowser {}
TEMPLATE = subdirs
SUBDIRS = components/styleitem
QML_IMPORT_PATH += $$OUT_PWD
OTHER_FILES = develop.qml \
gettingstarted.qml \
newssupport.qml \
......
import Qt 4.7
import QtQuick 1.0
import "widgets"
Image {
......
import QtQuick 1.0
import "../components" as Components
import components 1.0 as Components
Item {
id: exampleBrowserRoot
......
import QtQuick 1.0
import "../components" as Components
import components 1.0 as Components
Item {
InsetText {
id: text
......
import Qt 4.7
import "../components" as Components
import QtQuick 1.0
import components 1.0 as Components
BorderImage {
id: inner_background
......
import QtQuick 1.0
Item {
id: root
height: childrenRect.height
......
import QtQuick 1.0
Row {
id: tabBar
height: 25
......
import QtQuick 1.0
import "../components" as Components
import components 1.0 as Components
HeaderItemView {
header: qsTr("Recently Edited Projects")
......
import QtQuick 1.0
import "../components" as Components
import components 1.0 as Components
HeaderItemView {
header: qsTr("Recently Used Sessions")
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment