diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-03 18:15:53 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-03 18:15:55 +0100 |
commit | a79d616501f028183c154f175ec3ed0fa45ffd85 (patch) | |
tree | 1d4290d0e61db71571dcec2d250f4d5d07ef2c5f /examples | |
parent | 9e77d6c31b406e5941a2d287f3c8842954815db4 (diff) | |
parent | 3b7a8d9d5e214a88f5855800e7bf54da4425d7b9 (diff) |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I894ad7b4888744833f487b481950c087fa960a5c
Diffstat (limited to 'examples')
27 files changed, 179 insertions, 23 deletions
diff --git a/examples/qml/tutorials/extending/chapter1-basics/chapter1-basics.pro b/examples/qml/tutorials/extending/chapter1-basics/chapter1-basics.pro index 8ed66f8b66..c28664ea51 100644 --- a/examples/qml/tutorials/extending/chapter1-basics/chapter1-basics.pro +++ b/examples/qml/tutorials/extending/chapter1-basics/chapter1-basics.pro @@ -3,3 +3,13 @@ QT += qml quick HEADERS += piechart.h SOURCES += piechart.cpp \ main.cpp + +RESOURCES += chapter1-basics.qrc + +DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending/chapter1-basics +target.path = $$DESTPATH + +qml.files = *.qml +qml.path = $$DESTPATH + +INSTALLS += target qml diff --git a/examples/qml/tutorials/extending/chapter1-basics/chapter1-basics.qrc b/examples/qml/tutorials/extending/chapter1-basics/chapter1-basics.qrc new file mode 100644 index 0000000000..f1168aef3b --- /dev/null +++ b/examples/qml/tutorials/extending/chapter1-basics/chapter1-basics.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>app.qml</file> + </qresource> +</RCC> diff --git a/examples/qml/tutorials/extending/chapter1-basics/main.cpp b/examples/qml/tutorials/extending/chapter1-basics/main.cpp index d30628fd5a..4e719d2722 100644 --- a/examples/qml/tutorials/extending/chapter1-basics/main.cpp +++ b/examples/qml/tutorials/extending/chapter1-basics/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) QQuickView view; view.setResizeMode(QQuickView::SizeRootObjectToView); - view.setSource(QUrl::fromLocalFile("app.qml")); + view.setSource(QUrl("qrc:///app.qml")); view.show(); return app.exec(); } diff --git a/examples/qml/tutorials/extending/chapter2-methods/chapter2-methods.pro b/examples/qml/tutorials/extending/chapter2-methods/chapter2-methods.pro index 8ed66f8b66..a451c775cf 100644 --- a/examples/qml/tutorials/extending/chapter2-methods/chapter2-methods.pro +++ b/examples/qml/tutorials/extending/chapter2-methods/chapter2-methods.pro @@ -3,3 +3,13 @@ QT += qml quick HEADERS += piechart.h SOURCES += piechart.cpp \ main.cpp + +RESOURCES += chapter2-methods.qrc + +DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending/chapter2-methods +target.path = $$DESTPATH + +qml.files = *.qml +qml.path = $$DESTPATH + +INSTALLS += target qml diff --git a/examples/qml/tutorials/extending/chapter2-methods/chapter2-methods.qrc b/examples/qml/tutorials/extending/chapter2-methods/chapter2-methods.qrc new file mode 100644 index 0000000000..f1168aef3b --- /dev/null +++ b/examples/qml/tutorials/extending/chapter2-methods/chapter2-methods.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>app.qml</file> + </qresource> +</RCC> diff --git a/examples/qml/tutorials/extending/chapter2-methods/main.cpp b/examples/qml/tutorials/extending/chapter2-methods/main.cpp index d30628fd5a..4e719d2722 100644 --- a/examples/qml/tutorials/extending/chapter2-methods/main.cpp +++ b/examples/qml/tutorials/extending/chapter2-methods/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) QQuickView view; view.setResizeMode(QQuickView::SizeRootObjectToView); - view.setSource(QUrl::fromLocalFile("app.qml")); + view.setSource(QUrl("qrc:///app.qml")); view.show(); return app.exec(); } diff --git a/examples/qml/tutorials/extending/chapter3-bindings/chapter3-binding.qrc b/examples/qml/tutorials/extending/chapter3-bindings/chapter3-binding.qrc new file mode 100644 index 0000000000..f1168aef3b --- /dev/null +++ b/examples/qml/tutorials/extending/chapter3-bindings/chapter3-binding.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>app.qml</file> + </qresource> +</RCC> diff --git a/examples/qml/tutorials/extending/chapter3-bindings/chapter3-bindings.pro b/examples/qml/tutorials/extending/chapter3-bindings/chapter3-bindings.pro index 8ed66f8b66..6193f466c1 100644 --- a/examples/qml/tutorials/extending/chapter3-bindings/chapter3-bindings.pro +++ b/examples/qml/tutorials/extending/chapter3-bindings/chapter3-bindings.pro @@ -3,3 +3,13 @@ QT += qml quick HEADERS += piechart.h SOURCES += piechart.cpp \ main.cpp + +RESOURCES += chapter3-binding.qrc + +DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending/chapter3-binding +target.path = $$DESTPATH + +qml.files = *.qml +qml.path = $$DESTPATH + +INSTALLS += target qml diff --git a/examples/qml/tutorials/extending/chapter3-bindings/main.cpp b/examples/qml/tutorials/extending/chapter3-bindings/main.cpp index d30628fd5a..4e719d2722 100644 --- a/examples/qml/tutorials/extending/chapter3-bindings/main.cpp +++ b/examples/qml/tutorials/extending/chapter3-bindings/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) QQuickView view; view.setResizeMode(QQuickView::SizeRootObjectToView); - view.setSource(QUrl::fromLocalFile("app.qml")); + view.setSource(QUrl("qrc:///app.qml")); view.show(); return app.exec(); } diff --git a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro index 23eb222ea3..6d5c7acb6c 100644 --- a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro +++ b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro @@ -5,3 +5,13 @@ HEADERS += piechart.h \ SOURCES += piechart.cpp \ pieslice.cpp \ main.cpp + +RESOURCES += chapter4-customPropertyTypes.qrc + +DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending/chapter4-customPropertyTypes +target.path = $$DESTPATH + +qml.files = *.qml +qml.path = $$DESTPATH + +INSTALLS += target qml diff --git a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.qrc b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.qrc new file mode 100644 index 0000000000..f1168aef3b --- /dev/null +++ b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>app.qml</file> + </qresource> +</RCC> diff --git a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/main.cpp b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/main.cpp index 5b6e1cf451..fc59a11987 100644 --- a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/main.cpp +++ b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/main.cpp @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) QQuickView view; view.setResizeMode(QQuickView::SizeRootObjectToView); - view.setSource(QUrl::fromLocalFile("app.qml")); + view.setSource(QUrl("qrc:///app.qml")); view.show(); return app.exec(); diff --git a/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro b/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro index 23eb222ea3..7cc2b40488 100644 --- a/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro +++ b/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro @@ -5,3 +5,13 @@ HEADERS += piechart.h \ SOURCES += piechart.cpp \ pieslice.cpp \ main.cpp + +RESOURCES += chapter5-listproperties.qrc + +DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending/chapter5-listproperties +target.path = $$DESTPATH + +qml.files = *.qml +qml.path = $$DESTPATH + +INSTALLS += target qml diff --git a/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.qrc b/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.qrc new file mode 100644 index 0000000000..f1168aef3b --- /dev/null +++ b/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>app.qml</file> + </qresource> +</RCC> diff --git a/examples/qml/tutorials/extending/chapter5-listproperties/main.cpp b/examples/qml/tutorials/extending/chapter5-listproperties/main.cpp index f8826f6c31..8a4afcf96d 100644 --- a/examples/qml/tutorials/extending/chapter5-listproperties/main.cpp +++ b/examples/qml/tutorials/extending/chapter5-listproperties/main.cpp @@ -52,7 +52,7 @@ int main(int argc, char *argv[]) QQuickView view; view.setResizeMode(QQuickView::SizeRootObjectToView); - view.setSource(QUrl::fromLocalFile("app.qml")); + view.setSource(QUrl("qrc:///app.qml")); view.show(); return app.exec(); } diff --git a/examples/qml/tutorials/extending/chapter6-plugins/app.pro b/examples/qml/tutorials/extending/chapter6-plugins/app.pro new file mode 100644 index 0000000000..c55db00d27 --- /dev/null +++ b/examples/qml/tutorials/extending/chapter6-plugins/app.pro @@ -0,0 +1,10 @@ +TARGET = chapter6-plugins +QT += qml quick + +# Avoid going to debug/release subdirectory +# so that our application will see the +# import path for the Charts module. +win32: DESTDIR = ./ + +SOURCES += main.cpp +RESOURCES += app.qrc diff --git a/examples/qml/tutorials/extending/chapter6-plugins/app.qrc b/examples/qml/tutorials/extending/chapter6-plugins/app.qrc new file mode 100644 index 0000000000..f1168aef3b --- /dev/null +++ b/examples/qml/tutorials/extending/chapter6-plugins/app.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>app.qml</file> + </qresource> +</RCC> diff --git a/examples/qml/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/qml/tutorials/extending/chapter6-plugins/chapter6-plugins.pro index 6bf44b4d15..f858c80876 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/chapter6-plugins.pro +++ b/examples/qml/tutorials/extending/chapter6-plugins/chapter6-plugins.pro @@ -1,18 +1,5 @@ -TEMPLATE = lib -CONFIG += plugin -QT += qml quick - -DESTDIR = Charts -TARGET = chartsplugin - -OBJECTS_DIR = tmp -MOC_DIR = tmp - -HEADERS += piechart.h \ - pieslice.h \ - chartsplugin.h - -SOURCES += piechart.cpp \ - pieslice.cpp \ - chartsplugin.cpp - +TEMPLATE = subdirs +CONFIG += ordered +SUBDIRS = \ + import \ + app.pro diff --git a/examples/qml/tutorials/extending/chapter6-plugins/chartsplugin.cpp b/examples/qml/tutorials/extending/chapter6-plugins/import/chartsplugin.cpp index fea4c1aa85..fea4c1aa85 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/chartsplugin.cpp +++ b/examples/qml/tutorials/extending/chapter6-plugins/import/chartsplugin.cpp diff --git a/examples/qml/tutorials/extending/chapter6-plugins/chartsplugin.h b/examples/qml/tutorials/extending/chapter6-plugins/import/chartsplugin.h index d768306967..d768306967 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/chartsplugin.h +++ b/examples/qml/tutorials/extending/chapter6-plugins/import/chartsplugin.h diff --git a/examples/qml/tutorials/extending/chapter6-plugins/import/import.pro b/examples/qml/tutorials/extending/chapter6-plugins/import/import.pro new file mode 100644 index 0000000000..83cfb96ab5 --- /dev/null +++ b/examples/qml/tutorials/extending/chapter6-plugins/import/import.pro @@ -0,0 +1,26 @@ +TEMPLATE = lib +CONFIG += plugin +QT += qml quick + +DESTDIR = ../Charts +TARGET = $$qtLibraryTarget(chartsplugin) + +HEADERS += piechart.h \ + pieslice.h \ + chartsplugin.h + +SOURCES += piechart.cpp \ + pieslice.cpp \ + chartsplugin.cpp + +DESTPATH=$$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending/chapter6-plugins/Charts + +target.path=$$DESTPATH +qmldir.files=$$PWD/qmldir +qmldir.path=$$DESTPATH +INSTALLS += target qmldir + +OTHER_FILES += qmldir + +# Copy the qmldir file to the same folder as the plugin binary +QMAKE_POST_LINK += $$QMAKE_COPY $$replace($$list($$quote($$PWD/qmldir) $$DESTDIR), /, $$QMAKE_DIR_SEP) diff --git a/examples/qml/tutorials/extending/chapter6-plugins/piechart.cpp b/examples/qml/tutorials/extending/chapter6-plugins/import/piechart.cpp index 295bb8961d..295bb8961d 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/piechart.cpp +++ b/examples/qml/tutorials/extending/chapter6-plugins/import/piechart.cpp diff --git a/examples/qml/tutorials/extending/chapter6-plugins/piechart.h b/examples/qml/tutorials/extending/chapter6-plugins/import/piechart.h index b37bcdd411..b37bcdd411 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/piechart.h +++ b/examples/qml/tutorials/extending/chapter6-plugins/import/piechart.h diff --git a/examples/qml/tutorials/extending/chapter6-plugins/pieslice.cpp b/examples/qml/tutorials/extending/chapter6-plugins/import/pieslice.cpp index 52b409aa22..52b409aa22 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/pieslice.cpp +++ b/examples/qml/tutorials/extending/chapter6-plugins/import/pieslice.cpp diff --git a/examples/qml/tutorials/extending/chapter6-plugins/pieslice.h b/examples/qml/tutorials/extending/chapter6-plugins/import/pieslice.h index 0b488b4835..0b488b4835 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/pieslice.h +++ b/examples/qml/tutorials/extending/chapter6-plugins/import/pieslice.h diff --git a/examples/qml/tutorials/extending/chapter6-plugins/Charts/qmldir b/examples/qml/tutorials/extending/chapter6-plugins/import/qmldir index d9e8471b3c..d9e8471b3c 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/Charts/qmldir +++ b/examples/qml/tutorials/extending/chapter6-plugins/import/qmldir diff --git a/examples/qml/tutorials/extending/chapter6-plugins/main.cpp b/examples/qml/tutorials/extending/chapter6-plugins/main.cpp new file mode 100644 index 0000000000..60d8c6cd7a --- /dev/null +++ b/examples/qml/tutorials/extending/chapter6-plugins/main.cpp @@ -0,0 +1,53 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +//![0] +#include <QtQuick/QQuickView> +#include <QGuiApplication> + +int main(int argc, char *argv[]) +{ + QGuiApplication app(argc, argv); + QQuickView view; + view.setResizeMode(QQuickView::SizeRootObjectToView); + view.setSource(QUrl("qrc:///app.qml")); + view.show(); + return app.exec(); +} +//![0] |