forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
import QtQuick 1.0
|
import QtQuick 1.0
|
||||||
import "widgets"
|
import "widgets" as Widgets
|
||||||
import "components" as Components
|
import components 1.0 as Components
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
@@ -11,12 +11,12 @@ Item {
|
|||||||
Item {
|
Item {
|
||||||
height: Math.max(recentSessions.height, recentProjects.height)
|
height: Math.max(recentSessions.height, recentProjects.height)
|
||||||
width: root.width-40
|
width: root.width-40
|
||||||
RecentSessions {
|
Widgets.RecentSessions {
|
||||||
id: recentSessions
|
id: recentSessions
|
||||||
x: 10
|
x: 10
|
||||||
width: parent.width / 2 - 10
|
width: parent.width / 2 - 10
|
||||||
}
|
}
|
||||||
RecentProjects {
|
Widgets.RecentProjects {
|
||||||
id: recentProjects
|
id: recentProjects
|
||||||
x: parent.width / 2 + 10
|
x: parent.width / 2 + 10
|
||||||
width: parent.width / 2 - 10
|
width: parent.width / 2 - 10
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
import QtQuick 1.0
|
import QtQuick 1.0
|
||||||
import "widgets"
|
import "widgets" as Widgets
|
||||||
|
|
||||||
ExampleBrowser {}
|
Widgets.ExampleBrowser {}
|
||||||
|
@@ -1,6 +1,8 @@
|
|||||||
TEMPLATE = subdirs
|
TEMPLATE = subdirs
|
||||||
SUBDIRS = components/styleitem
|
SUBDIRS = components/styleitem
|
||||||
|
|
||||||
|
QML_IMPORT_PATH += $$OUT_PWD
|
||||||
|
|
||||||
OTHER_FILES = develop.qml \
|
OTHER_FILES = develop.qml \
|
||||||
gettingstarted.qml \
|
gettingstarted.qml \
|
||||||
newssupport.qml \
|
newssupport.qml \
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
import Qt 4.7
|
import QtQuick 1.0
|
||||||
import "widgets"
|
import "widgets"
|
||||||
|
|
||||||
Image {
|
Image {
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
import QtQuick 1.0
|
import QtQuick 1.0
|
||||||
import "../components" as Components
|
import components 1.0 as Components
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: exampleBrowserRoot
|
id: exampleBrowserRoot
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
import QtQuick 1.0
|
import QtQuick 1.0
|
||||||
import "../components" as Components
|
import components 1.0 as Components
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
InsetText {
|
InsetText {
|
||||||
id: text
|
id: text
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
import Qt 4.7
|
import QtQuick 1.0
|
||||||
import "../components" as Components
|
import components 1.0 as Components
|
||||||
|
|
||||||
BorderImage {
|
BorderImage {
|
||||||
id: inner_background
|
id: inner_background
|
||||||
|
@@ -1,4 +1,5 @@
|
|||||||
import QtQuick 1.0
|
import QtQuick 1.0
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
height: childrenRect.height
|
height: childrenRect.height
|
||||||
|
@@ -1,6 +1,5 @@
|
|||||||
import QtQuick 1.0
|
import QtQuick 1.0
|
||||||
|
|
||||||
|
|
||||||
Row {
|
Row {
|
||||||
id: tabBar
|
id: tabBar
|
||||||
height: 25
|
height: 25
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
import QtQuick 1.0
|
import QtQuick 1.0
|
||||||
import "../components" as Components
|
import components 1.0 as Components
|
||||||
|
|
||||||
HeaderItemView {
|
HeaderItemView {
|
||||||
header: qsTr("Recently Edited Projects")
|
header: qsTr("Recently Edited Projects")
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
import QtQuick 1.0
|
import QtQuick 1.0
|
||||||
import "../components" as Components
|
import components 1.0 as Components
|
||||||
|
|
||||||
HeaderItemView {
|
HeaderItemView {
|
||||||
header: qsTr("Recently Used Sessions")
|
header: qsTr("Recently Used Sessions")
|
||||||
|
@@ -182,6 +182,7 @@ void WelcomeMode::initPlugins()
|
|||||||
|
|
||||||
QDeclarativeEngine *engine = m_welcomePage->engine();
|
QDeclarativeEngine *engine = m_welcomePage->engine();
|
||||||
engine->setNetworkAccessManagerFactory(new NetworkAccessManagerFactory);
|
engine->setNetworkAccessManagerFactory(new NetworkAccessManagerFactory);
|
||||||
|
engine->addImportPath(Core::ICore::instance()->resourcePath() + "/welcomescreen");
|
||||||
foreach (Utils::IWelcomePage *plugin, plugins) {
|
foreach (Utils::IWelcomePage *plugin, plugins) {
|
||||||
plugin->facilitateQml(engine);
|
plugin->facilitateQml(engine);
|
||||||
m_pluginList.append(plugin);
|
m_pluginList.append(plugin);
|
||||||
|
Reference in New Issue
Block a user