From ee74b8c84b9f435ede3bf81d1de4508dad088546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Tue, 22 Jan 2013 17:59:28 +0100 Subject: Package resources for webkit qml examples in resource files. This adds qrc files for the two webkit qml examples and a shared one to package shared resources. Depends on the fix for https://bugs.webkit.org/show_bug.cgi?id=107031 being merged to the Qt WebKit module. Task-number: QTWEBKIT-388 Change-Id: If02b6cfe72acd9b3d2a09b525b035646d1538dc7 Reviewed-by: Andras Becsi --- examples/webkitqml/flickrview/flickrview.pro | 7 ++++--- examples/webkitqml/flickrview/flickrview.qml | 10 +++++----- examples/webkitqml/flickrview/flickrview.qrc | 6 ++++++ examples/webkitqml/flickrview/images/flickr.png | Bin 0 -> 6818 bytes examples/webkitqml/shared/LoadIndicator.qml | 2 +- examples/webkitqml/shared/images/flickr.png | Bin 6818 -> 0 bytes examples/webkitqml/shared/main.cpp | 4 ++-- examples/webkitqml/shared/shared.qrc | 10 ++++++++++ .../webkitqml/youtubeview/content/YouTubeDialog.qml | 4 ++-- examples/webkitqml/youtubeview/youtubeview.pro | 3 +++ examples/webkitqml/youtubeview/youtubeview.qml | 16 ++++++++-------- examples/webkitqml/youtubeview/youtubeview.qrc | 7 +++++++ 12 files changed, 48 insertions(+), 21 deletions(-) create mode 100644 examples/webkitqml/flickrview/flickrview.qrc create mode 100644 examples/webkitqml/flickrview/images/flickr.png delete mode 100644 examples/webkitqml/shared/images/flickr.png create mode 100644 examples/webkitqml/shared/shared.qrc create mode 100644 examples/webkitqml/youtubeview/youtubeview.qrc (limited to 'examples') diff --git a/examples/webkitqml/flickrview/flickrview.pro b/examples/webkitqml/flickrview/flickrview.pro index 33d9320..bc88cff 100644 --- a/examples/webkitqml/flickrview/flickrview.pro +++ b/examples/webkitqml/flickrview/flickrview.pro @@ -7,7 +7,8 @@ SOURCES += ../shared/main.cpp mac: CONFIG -= app_bundle +RESOURCES += flickrview.qrc \ + ../shared/shared.qrc + target.path = $$[QT_INSTALL_EXAMPLES]/webkitqml/flickrview -qml.files = flickrview.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/webkitqml/flickrview -INSTALLS += target qml +INSTALLS += target diff --git a/examples/webkitqml/flickrview/flickrview.qml b/examples/webkitqml/flickrview/flickrview.qml index e5e3dfd..b303b1b 100644 --- a/examples/webkitqml/flickrview/flickrview.qml +++ b/examples/webkitqml/flickrview/flickrview.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtWebKit 3.0 import QtQuick.XmlListModel 2.0 -import "../shared" +import "qrc:/shared" as Shared Rectangle { id: container @@ -156,7 +156,7 @@ Rectangle { left: parent.left } Image { - source: "../shared/images/arrow.png" + source: "qrc:/shared/images/arrow.png" width: 30 height: 30 visible: updateInfo.state != "update" @@ -189,7 +189,7 @@ Rectangle { } } - LoadIndicator { + Shared.LoadIndicator { anchors.fill: parent color: "black" running: !listView.visible && model.status != XmlListModel.Error @@ -247,9 +247,9 @@ Rectangle { } } - LoadIndicator { + Shared.LoadIndicator { anchors.fill: parent - imageSource: "images/flickr.png" + imageSource: "qrc:/images/flickr.png" running: webView.loading } } diff --git a/examples/webkitqml/flickrview/flickrview.qrc b/examples/webkitqml/flickrview/flickrview.qrc new file mode 100644 index 0000000..35c793c --- /dev/null +++ b/examples/webkitqml/flickrview/flickrview.qrc @@ -0,0 +1,6 @@ + + + flickrview.qml + images/flickr.png + + diff --git a/examples/webkitqml/flickrview/images/flickr.png b/examples/webkitqml/flickrview/images/flickr.png new file mode 100644 index 0000000..d0f0502 Binary files /dev/null and b/examples/webkitqml/flickrview/images/flickr.png differ diff --git a/examples/webkitqml/shared/LoadIndicator.qml b/examples/webkitqml/shared/LoadIndicator.qml index 6d972e9..d181f15 100644 --- a/examples/webkitqml/shared/LoadIndicator.qml +++ b/examples/webkitqml/shared/LoadIndicator.qml @@ -44,7 +44,7 @@ Rectangle { id: container property bool running: false - property string imageSource: "images/busy.png" + property string imageSource: "qrc:/shared/images/busy.png" visible: running diff --git a/examples/webkitqml/shared/images/flickr.png b/examples/webkitqml/shared/images/flickr.png deleted file mode 100644 index d0f0502..0000000 Binary files a/examples/webkitqml/shared/images/flickr.png and /dev/null differ diff --git a/examples/webkitqml/shared/main.cpp b/examples/webkitqml/shared/main.cpp index c77a22b..ac1de3e 100644 --- a/examples/webkitqml/shared/main.cpp +++ b/examples/webkitqml/shared/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. @@ -43,7 +43,7 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc,argv); QQuickView view; - view.setSource(QUrl::fromLocalFile(QCoreApplication::applicationDirPath() + QLatin1String("/" QWEBKIT_EXAMPLE_NAME ".qml"))); + view.setSource(QUrl("qrc:///"QWEBKIT_EXAMPLE_NAME".qml")); view.setResizeMode(QQuickView::SizeRootObjectToView); view.show(); return app.exec(); diff --git a/examples/webkitqml/shared/shared.qrc b/examples/webkitqml/shared/shared.qrc new file mode 100644 index 0000000..9aa4172 --- /dev/null +++ b/examples/webkitqml/shared/shared.qrc @@ -0,0 +1,10 @@ + + + images/arrow.png + images/busy.png + images/less.png + images/more.png + Button.qml + LoadIndicator.qml + + diff --git a/examples/webkitqml/youtubeview/content/YouTubeDialog.qml b/examples/webkitqml/youtubeview/content/YouTubeDialog.qml index b02400e..21bdc40 100644 --- a/examples/webkitqml/youtubeview/content/YouTubeDialog.qml +++ b/examples/webkitqml/youtubeview/content/YouTubeDialog.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "../../shared" +import "qrc:/shared" as Shared Rectangle { id: container @@ -77,7 +77,7 @@ Rectangle { Component { id: delegate - Button { + Shared.Button { buttonWidth: 200 text: name onClicked: presetClicked(name) diff --git a/examples/webkitqml/youtubeview/youtubeview.pro b/examples/webkitqml/youtubeview/youtubeview.pro index cdc71e9..b67072f 100644 --- a/examples/webkitqml/youtubeview/youtubeview.pro +++ b/examples/webkitqml/youtubeview/youtubeview.pro @@ -14,3 +14,6 @@ INSTALLS += target qml OTHER_FILES += \ player.html + +RESOURCES += youtubeview.qrc \ + ../shared/shared.qrc diff --git a/examples/webkitqml/youtubeview/youtubeview.qml b/examples/webkitqml/youtubeview/youtubeview.qml index b002319..16873d6 100644 --- a/examples/webkitqml/youtubeview/youtubeview.qml +++ b/examples/webkitqml/youtubeview/youtubeview.qml @@ -41,8 +41,8 @@ import QtQuick 2.0 import QtWebKit 3.0 import QtQuick.XmlListModel 2.0 -import "content" -import "../shared" +import "qrc:/shared" as Shared +import "qrc:/content" as Content Rectangle { id: container @@ -77,7 +77,7 @@ Rectangle { anchors.fill: parent opacity: 0 - url: "content/player.html?" + currentVideo.vId + url: "qrc:///content/player.html?" + currentVideo.vId Behavior on opacity { NumberAnimation { duration: 200 } } @@ -105,7 +105,7 @@ Rectangle { } } - YouTubeDialog { + Content.YouTubeDialog { id: presetDialog anchors.fill: parent visible: false @@ -190,7 +190,7 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter width: height height: visible ? listView.contentItem.height : 0 - Image { anchors.centerIn: parent; width: 50; height: 50; source: "../shared/images/less.png" } + Image { anchors.centerIn: parent; width: 50; height: 50; source: "qrc:/shared/images/less.png" } MouseArea { anchors.fill: parent onClicked: model.requestLess() @@ -205,7 +205,7 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter width: height height: visible ? listView.contentItem.height : 0 - Image { anchors.centerIn: parent; width: 50; height: 50; source: "../shared/images/more.png" } + Image { anchors.centerIn: parent; width: 50; height: 50; source: "qrc:/shared/images/more.png" } MouseArea { anchors.fill: parent onClicked: model.requestMore() @@ -240,7 +240,7 @@ Rectangle { } } - LoadIndicator { + Shared.LoadIndicator { anchors.fill: parent color: "black" running: panel.state == "list" && model.status != XmlListModel.Ready @@ -308,7 +308,7 @@ Rectangle { } } - Button { + Shared.Button { id: button buttonHeight: container.padding buttonWidth: container.width diff --git a/examples/webkitqml/youtubeview/youtubeview.qrc b/examples/webkitqml/youtubeview/youtubeview.qrc new file mode 100644 index 0000000..1440b31 --- /dev/null +++ b/examples/webkitqml/youtubeview/youtubeview.qrc @@ -0,0 +1,7 @@ + + + content/YouTubeDialog.qml + content/player.html + youtubeview.qml + + -- cgit v1.2.1