feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

WelcomeScreen: fix components imports on Windows

Browse Source 
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>
This commit is contained in:
Daniel Molkentin
2011-06-30 13:53:36 +02:00
parent eb42871890
commit b18ef1ffb2
12 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
share/qtcreator/welcomescreen/develop.qml
View File

@@ -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

4
share/qtcreator/welcomescreen/gettingstarted.qml
View File

@@ -1,4 +1,4 @@
import QtQuick 1.0
import "widgets"
import "widgets" as Widgets
ExampleBrowser {}
Widgets.ExampleBrowser {}

2
share/qtcreator/welcomescreen/welcomescreen.pro
View File

@@ -1,6 +1,8 @@
TEMPLATE = subdirs
SUBDIRS = components/styleitem
QML_IMPORT_PATH += $$OUT_PWD
OTHER_FILES = develop.qml \
gettingstarted.qml \
newssupport.qml \

2
share/qtcreator/welcomescreen/welcomescreen.qml
View File

@@ -1,4 +1,4 @@
import Qt 4.7
import QtQuick 1.0
import "widgets"
Image {

2
share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml
View File

@@ -1,5 +1,5 @@
import QtQuick 1.0
import "../components" as Components
import components 1.0 as Components
Item {
id: exampleBrowserRoot

3
share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml
View File

@@ -1,5 +1,6 @@
import QtQuick 1.0
import "../components" as Components
import components 1.0 as Components
Item {
InsetText {
id: text

4
share/qtcreator/welcomescreen/widgets/Feedback.qml
View File

@@ -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

1
share/qtcreator/welcomescreen/widgets/HeaderItemView.qml
View File

@@ -1,4 +1,5 @@
import QtQuick 1.0
Item {
id: root
height: childrenRect.height

1
share/qtcreator/welcomescreen/widgets/LinksBar.qml
View File

@@ -1,6 +1,5 @@
import QtQuick 1.0
Row {
id: tabBar
height: 25

2
share/qtcreator/welcomescreen/widgets/RecentProjects.qml
View File

@@ -1,5 +1,5 @@
import QtQuick 1.0
import "../components" as Components
import components 1.0 as Components
HeaderItemView {
header: qsTr("Recently Edited Projects")

2
share/qtcreator/welcomescreen/widgets/RecentSessions.qml
View File

@@ -1,5 +1,5 @@
import QtQuick 1.0
import "../components" as Components
import components 1.0 as Components
HeaderItemView {
header: qsTr("Recently Used Sessions")

1
src/plugins/welcome/welcomeplugin.cpp
View File

@@ -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);