From f21e9ba6efa2b1c8169491db271f79b87b5b0ce4 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Tue, 7 Aug 2012 11:26:37 +1000 Subject: Remove interim compatibility measures Also update some variables in qtdeclarative which failed to update rootItem->contentItem. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d3 Reviewed-by: Alan Alpert <416365416c@gmail.com> --- examples/quick/scenegraph/openglunderqml/squircle.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/quick/scenegraph/openglunderqml/squircle.cpp b/examples/quick/scenegraph/openglunderqml/squircle.cpp index 24e8533d8e..867ce4a7e0 100644 --- a/examples/quick/scenegraph/openglunderqml/squircle.cpp +++ b/examples/quick/scenegraph/openglunderqml/squircle.cpp @@ -59,8 +59,8 @@ void Squircle::setT(qreal t) return; m_t = t; emit tChanged(); - if (canvas()) - canvas()->update(); + if (window()) + window()->update(); } //! [8] @@ -113,7 +113,7 @@ void Squircle::paint() m_program->bindAttributeLocation("vertices", 0); m_program->link(); - connect(canvas()->openglContext(), SIGNAL(aboutToBeDestroyed()), + connect(window()->openglContext(), SIGNAL(aboutToBeDestroyed()), this, SLOT(cleanup()), Qt::DirectConnection); } //! [4] //! [5] -- cgit v1.2.3 From 4578a6fcba8b590a4a9b75559f7fcb80c3037c80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= Date: Tue, 16 Oct 2012 19:41:16 +0200 Subject: Use the shared boilerplate code in the tweetsearch demo Without the shared boilerplate code, the demo will not run unless the application is launched from the directory containing the QML files. Also, it improves consistency to use the same code as with the other examples. Change-Id: Ic3bc358c13cdee4310aaaf7daf4c645c4709027e Reviewed-by: Robin Burchell --- examples/demos/tweetsearch/main.cpp | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'examples') diff --git a/examples/demos/tweetsearch/main.cpp b/examples/demos/tweetsearch/main.cpp index 211d3eb07b..8b1d59679c 100644 --- a/examples/demos/tweetsearch/main.cpp +++ b/examples/demos/tweetsearch/main.cpp @@ -37,27 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ - -#include -#include -#include -#include - -void usage() -{ - exit(0); -} - -int main(int argc, char* argv[]) -{ - QGuiApplication app(argc,argv); - QQuickView view; - QUrl launchFile = QUrl::fromLocalFile(QLatin1String("tweetsearch.qml")); - if (app.arguments().contains(QLatin1String("-help"))) - usage(); - view.connect(view.engine(), SIGNAL(quit()), &app, SLOT(quit())); - view.setSource(launchFile); - view.show(); - return app.exec(); -} - +#include "../../shared/shared.h" +DECLARATIVE_EXAMPLE_MAIN(tweetsearch) -- cgit v1.2.3 From 62e8934fe3879665d14092543ad06bb17ce9071f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= Date: Tue, 16 Oct 2012 20:33:55 +0200 Subject: Make Qt.quit() from inside QML work in the examples Without this patch, the samegame's quit button does not work. Change-Id: I904832d018d589e90564534ac1eca02e0dbb54fc Reviewed-by: Friedemann Kleint Reviewed-by: Kai Koehne --- examples/shared/shared.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'examples') diff --git a/examples/shared/shared.h b/examples/shared/shared.h index 0e9395a108..bf3857f896 100644 --- a/examples/shared/shared.h +++ b/examples/shared/shared.h @@ -39,6 +39,7 @@ ****************************************************************************/ #include #include +#include #include #define DECLARATIVE_EXAMPLE_MAIN(NAME) int main(int argc, char* argv[]) \ {\ @@ -68,6 +69,7 @@ qWarning("Could not find file '%s'", qPrintable(QDir::toNativeSeparators(fileName)));\ return -1;\ }\ + view.connect(view.engine(), SIGNAL(quit()), &app, SLOT(quit()));\ view.setSource(QUrl::fromLocalFile(fileName));\ view.show();\ return app.exec();\ -- cgit v1.2.3 From b7e319bc30f47c4ea43b8aaa9402727c775c2d0c Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Tue, 23 Oct 2012 12:44:41 +0200 Subject: Changed the plugin module name The earlier name, com.nokia.TimeExample is irrelevant now. Also updated all instances of documentation where this older module name was referred. Change-Id: Ic252d0e72af23c2d39d5fed55f242e47c1b6bde9 Reviewed-by: J-P Nurmi Reviewed-by: Jens Bache-Wiig --- examples/qml/plugins/README | 9 --- .../qml/plugins/com/nokia/TimeExample/Clock.qml | 88 --------------------- .../qml/plugins/com/nokia/TimeExample/center.png | Bin 765 -> 0 bytes .../qml/plugins/com/nokia/TimeExample/clock.png | Bin 20653 -> 0 bytes .../qml/plugins/com/nokia/TimeExample/hour.png | Bin 625 -> 0 bytes .../qml/plugins/com/nokia/TimeExample/minute.png | Bin 625 -> 0 bytes examples/qml/plugins/com/nokia/TimeExample/qmldir | 3 - .../qml/plugins/doc/images/qml-plugins-example.png | Bin 0 -> 15773 bytes examples/qml/plugins/doc/src/qmlpluginex.qdoc | 42 ++++++++++ examples/qml/plugins/imports/TimeExample/Clock.qml | 88 +++++++++++++++++++++ .../qml/plugins/imports/TimeExample/center.png | Bin 0 -> 765 bytes examples/qml/plugins/imports/TimeExample/clock.png | Bin 0 -> 20653 bytes examples/qml/plugins/imports/TimeExample/hour.png | Bin 0 -> 625 bytes .../qml/plugins/imports/TimeExample/minute.png | Bin 0 -> 625 bytes examples/qml/plugins/imports/TimeExample/qmldir | 3 + examples/qml/plugins/plugin.cpp | 2 +- examples/qml/plugins/plugins.pro | 20 ++--- examples/qml/plugins/plugins.qml | 4 +- 18 files changed, 146 insertions(+), 113 deletions(-) delete mode 100644 examples/qml/plugins/README delete mode 100644 examples/qml/plugins/com/nokia/TimeExample/Clock.qml delete mode 100644 examples/qml/plugins/com/nokia/TimeExample/center.png delete mode 100644 examples/qml/plugins/com/nokia/TimeExample/clock.png delete mode 100644 examples/qml/plugins/com/nokia/TimeExample/hour.png delete mode 100644 examples/qml/plugins/com/nokia/TimeExample/minute.png delete mode 100644 examples/qml/plugins/com/nokia/TimeExample/qmldir create mode 100644 examples/qml/plugins/doc/images/qml-plugins-example.png create mode 100644 examples/qml/plugins/doc/src/qmlpluginex.qdoc create mode 100644 examples/qml/plugins/imports/TimeExample/Clock.qml create mode 100644 examples/qml/plugins/imports/TimeExample/center.png create mode 100644 examples/qml/plugins/imports/TimeExample/clock.png create mode 100644 examples/qml/plugins/imports/TimeExample/hour.png create mode 100644 examples/qml/plugins/imports/TimeExample/minute.png create mode 100644 examples/qml/plugins/imports/TimeExample/qmldir (limited to 'examples') diff --git a/examples/qml/plugins/README b/examples/qml/plugins/README deleted file mode 100644 index f4f9074059..0000000000 --- a/examples/qml/plugins/README +++ /dev/null @@ -1,9 +0,0 @@ -This example shows a module "com.nokia.TimeExample" that is implemented -by a C++ plugin (providing the "Time" type), and by QML files (providing the -"Clock" type). - -To run: - - make install - QML_IMPORT_PATH=$PWD qmlscene plugins.qml - diff --git a/examples/qml/plugins/com/nokia/TimeExample/Clock.qml b/examples/qml/plugins/com/nokia/TimeExample/Clock.qml deleted file mode 100644 index ca57caeee5..0000000000 --- a/examples/qml/plugins/com/nokia/TimeExample/Clock.qml +++ /dev/null @@ -1,88 +0,0 @@ -/**************************************************************************** -** -** 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. -** -** $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$ -** -****************************************************************************/ - -import QtQuick 2.0 - -Rectangle { - id: clock - width: 200; height: 200; color: "gray" - - property alias city: cityLabel.text - property variant hours - property variant minutes - property variant shift : 0 - - Image { id: background; source: "clock.png" } - - Image { - x: 92.5; y: 27 - source: "hour.png" - transform: Rotation { - id: hourRotation - origin.x: 7.5; origin.y: 73; - angle: (clock.hours * 30) + (clock.minutes * 0.5) - Behavior on angle { - SpringAnimation{ spring: 2; damping: 0.2; modulus: 360 } - } - } - } - - Image { - x: 93.5; y: 17 - source: "minute.png" - transform: Rotation { - id: minuteRotation - origin.x: 6.5; origin.y: 83; - angle: clock.minutes * 6 - Behavior on angle { - SpringAnimation{ spring: 2; damping: 0.2; modulus: 360 } - } - } - } - - Image { - anchors.centerIn: background; source: "center.png" - } - - Text { - id: cityLabel; font.bold: true; font.pixelSize: 14; y:200; color: "white" - anchors.horizontalCenter: parent.horizontalCenter - } -} diff --git a/examples/qml/plugins/com/nokia/TimeExample/center.png b/examples/qml/plugins/com/nokia/TimeExample/center.png deleted file mode 100644 index 7fbd802a44..0000000000 Binary files a/examples/qml/plugins/com/nokia/TimeExample/center.png and /dev/null differ diff --git a/examples/qml/plugins/com/nokia/TimeExample/clock.png b/examples/qml/plugins/com/nokia/TimeExample/clock.png deleted file mode 100644 index 462edacc0e..0000000000 Binary files a/examples/qml/plugins/com/nokia/TimeExample/clock.png and /dev/null differ diff --git a/examples/qml/plugins/com/nokia/TimeExample/hour.png b/examples/qml/plugins/com/nokia/TimeExample/hour.png deleted file mode 100644 index f8061a1235..0000000000 Binary files a/examples/qml/plugins/com/nokia/TimeExample/hour.png and /dev/null differ diff --git a/examples/qml/plugins/com/nokia/TimeExample/minute.png b/examples/qml/plugins/com/nokia/TimeExample/minute.png deleted file mode 100644 index 1297ec7c2b..0000000000 Binary files a/examples/qml/plugins/com/nokia/TimeExample/minute.png and /dev/null differ diff --git a/examples/qml/plugins/com/nokia/TimeExample/qmldir b/examples/qml/plugins/com/nokia/TimeExample/qmldir deleted file mode 100644 index 9304d95435..0000000000 --- a/examples/qml/plugins/com/nokia/TimeExample/qmldir +++ /dev/null @@ -1,3 +0,0 @@ -module com.nokia.TimeExample -Clock 1.0 Clock.qml -plugin qmlqtimeexampleplugin diff --git a/examples/qml/plugins/doc/images/qml-plugins-example.png b/examples/qml/plugins/doc/images/qml-plugins-example.png new file mode 100644 index 0000000000..c2d4886ea2 Binary files /dev/null and b/examples/qml/plugins/doc/images/qml-plugins-example.png differ diff --git a/examples/qml/plugins/doc/src/qmlpluginex.qdoc b/examples/qml/plugins/doc/src/qmlpluginex.qdoc new file mode 100644 index 0000000000..464f42a34c --- /dev/null +++ b/examples/qml/plugins/doc/src/qmlpluginex.qdoc @@ -0,0 +1,42 @@ +/**************************************************************************** +** +** Copyright (C) 2012 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:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \title QML Plugin Example + \example plugins + + \brief This example creates a C++ plugin extension by subclassing QQmlExtensionPlugin. + + \image qml-plugins-example.png + + To run this example, use the following commands on the prompt: + \code + > qmake + > make + > qmlscene -I imports plugins.qml + \endcode +*/ diff --git a/examples/qml/plugins/imports/TimeExample/Clock.qml b/examples/qml/plugins/imports/TimeExample/Clock.qml new file mode 100644 index 0000000000..ca57caeee5 --- /dev/null +++ b/examples/qml/plugins/imports/TimeExample/Clock.qml @@ -0,0 +1,88 @@ +/**************************************************************************** +** +** 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. +** +** $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$ +** +****************************************************************************/ + +import QtQuick 2.0 + +Rectangle { + id: clock + width: 200; height: 200; color: "gray" + + property alias city: cityLabel.text + property variant hours + property variant minutes + property variant shift : 0 + + Image { id: background; source: "clock.png" } + + Image { + x: 92.5; y: 27 + source: "hour.png" + transform: Rotation { + id: hourRotation + origin.x: 7.5; origin.y: 73; + angle: (clock.hours * 30) + (clock.minutes * 0.5) + Behavior on angle { + SpringAnimation{ spring: 2; damping: 0.2; modulus: 360 } + } + } + } + + Image { + x: 93.5; y: 17 + source: "minute.png" + transform: Rotation { + id: minuteRotation + origin.x: 6.5; origin.y: 83; + angle: clock.minutes * 6 + Behavior on angle { + SpringAnimation{ spring: 2; damping: 0.2; modulus: 360 } + } + } + } + + Image { + anchors.centerIn: background; source: "center.png" + } + + Text { + id: cityLabel; font.bold: true; font.pixelSize: 14; y:200; color: "white" + anchors.horizontalCenter: parent.horizontalCenter + } +} diff --git a/examples/qml/plugins/imports/TimeExample/center.png b/examples/qml/plugins/imports/TimeExample/center.png new file mode 100644 index 0000000000..7fbd802a44 Binary files /dev/null and b/examples/qml/plugins/imports/TimeExample/center.png differ diff --git a/examples/qml/plugins/imports/TimeExample/clock.png b/examples/qml/plugins/imports/TimeExample/clock.png new file mode 100644 index 0000000000..462edacc0e Binary files /dev/null and b/examples/qml/plugins/imports/TimeExample/clock.png differ diff --git a/examples/qml/plugins/imports/TimeExample/hour.png b/examples/qml/plugins/imports/TimeExample/hour.png new file mode 100644 index 0000000000..f8061a1235 Binary files /dev/null and b/examples/qml/plugins/imports/TimeExample/hour.png differ diff --git a/examples/qml/plugins/imports/TimeExample/minute.png b/examples/qml/plugins/imports/TimeExample/minute.png new file mode 100644 index 0000000000..1297ec7c2b Binary files /dev/null and b/examples/qml/plugins/imports/TimeExample/minute.png differ diff --git a/examples/qml/plugins/imports/TimeExample/qmldir b/examples/qml/plugins/imports/TimeExample/qmldir new file mode 100644 index 0000000000..252e662e12 --- /dev/null +++ b/examples/qml/plugins/imports/TimeExample/qmldir @@ -0,0 +1,3 @@ +module TimeExample +Clock 1.0 Clock.qml +plugin qmlqtimeexampleplugin diff --git a/examples/qml/plugins/plugin.cpp b/examples/qml/plugins/plugin.cpp index 6fce23b62c..d9bbded996 100644 --- a/examples/qml/plugins/plugin.cpp +++ b/examples/qml/plugins/plugin.cpp @@ -146,7 +146,7 @@ class QExampleQmlPlugin : public QQmlExtensionPlugin public: void registerTypes(const char *uri) { - Q_ASSERT(uri == QLatin1String("com.nokia.TimeExample")); + Q_ASSERT(uri == QLatin1String("TimeExample")); qmlRegisterType(uri, 1, 0, "Time"); } }; diff --git a/examples/qml/plugins/plugins.pro b/examples/qml/plugins/plugins.pro index e127509c0d..2c748f7952 100644 --- a/examples/qml/plugins/plugins.pro +++ b/examples/qml/plugins/plugins.pro @@ -2,24 +2,24 @@ TEMPLATE = lib CONFIG += qt plugin QT += qml -DESTDIR = com/nokia/TimeExample +DESTDIR = imports/TimeExample TARGET = qmlqtimeexampleplugin SOURCES += plugin.cpp qdeclarativesources.files += \ - com/nokia/TimeExample/qmldir \ - com/nokia/TimeExample/center.png \ - com/nokia/TimeExample/clock.png \ - com/nokia/TimeExample/Clock.qml \ - com/nokia/TimeExample/hour.png \ - com/nokia/TimeExample/minute.png + imports/TimeExample/qmldir \ + imports/TimeExample/center.png \ + imports/TimeExample/clock.png \ + imports/TimeExample/Clock.qml \ + imports/TimeExample/hour.png \ + imports/TimeExample/minute.png -qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/plugins/com/nokia/TimeExample +qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/plugins/imports/TimeExample -sources.files += plugins.pro plugin.cpp plugins.qml README +sources.files += plugins.pro plugin.cpp plugins.qml sources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/plugins -target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/plugins/com/nokia/TimeExample +target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/plugins/imports/TimeExample INSTALLS += qdeclarativesources sources target diff --git a/examples/qml/plugins/plugins.qml b/examples/qml/plugins/plugins.qml index a184395c64..db570cf307 100644 --- a/examples/qml/plugins/plugins.qml +++ b/examples/qml/plugins/plugins.qml @@ -38,9 +38,9 @@ ** ****************************************************************************/ //![0] -import com.nokia.TimeExample 1.0 // import types from the plugin +import TimeExample 1.0 // import types from the plugin -Clock { // this class is defined in QML (com/nokia/TimeExample/Clock.qml) +Clock { // this class is defined in QML (imports/TimeExample/Clock.qml) Time { // this class is defined in C++ (plugin.cpp) id: time -- cgit v1.2.3 From f15c56a14c671734610a701884c82a096a2cada7 Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Thu, 1 Nov 2012 14:36:53 +0100 Subject: Update Nokia references to Digia's. Change-Id: I3be91d4a6a1116c79ab6aca89d189c88a265d339 Reviewed-by: Akseli Salovaara Reviewed-by: Sergio Ahumada --- examples/qml/networkaccessmanagerfactory/view.qml | 2 +- examples/quick/text/styledtext-layout.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/qml/networkaccessmanagerfactory/view.qml b/examples/qml/networkaccessmanagerfactory/view.qml index 0548c0bedc..10ad351d25 100644 --- a/examples/qml/networkaccessmanagerfactory/view.qml +++ b/examples/qml/networkaccessmanagerfactory/view.qml @@ -43,5 +43,5 @@ import QtQuick 2.0 Image { width: 100 height: 100 - source: "http://qt.nokia.com/logo.png" + source: "http://qt.digia.com/Documents/Qt_master_logo_CMYK_noback.gif" } diff --git a/examples/quick/text/styledtext-layout.qml b/examples/quick/text/styledtext-layout.qml index 8ae38e4cbc..0d76084ba6 100644 --- a/examples/quick/text/styledtext-layout.qml +++ b/examples/quick/text/styledtext-layout.qml @@ -58,7 +58,7 @@ Rectangle { textFormat: Text.StyledText horizontalAlignment: Text.AlignJustify - text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer at ante dui www.nokia.com.
Curabitur ante est, pulvinar quis adipiscing a, iaculis id ipsum. Nunc blandit condimentum odio vel egestas.
  • Coffee
    1. Espresso
    2. Cappuccino
    3. Latte
  • Juice
    1. Orange
    2. Apple
    3. Pineapple
    4. Tomato

Proin consectetur sapien in ipsum lacinia sit amet mattis orci interdum. Quisque vitae accumsan lectus. Ut nisi turpis, sollicitudin ut dignissim id, fermentum ac est. Maecenas nec libero leo. Sed ac leo eget ipsum ultricies viverra sit amet eu orci. Praesent et tortor risus, viverra accumsan sapien. Sed faucibus eleifend lectus, sed euismod urna porta eu. Quisque vitae accumsan lectus. Ut nisi turpis, sollicitudin ut dignissim id, fermentum ac est. Maecenas nec libero leo. Sed ac leo eget ipsum ultricies viverra sit amet eu orci." + text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer at ante dui www.digia.com.
Curabitur ante est, pulvinar quis adipiscing a, iaculis id ipsum. Nunc blandit condimentum odio vel egestas.

  • Coffee
    1. Espresso
    2. Cappuccino
    3. Latte
  • Juice
    1. Orange
    2. Apple
    3. Pineapple
    4. Tomato

Proin consectetur sapien in ipsum lacinia sit amet mattis orci interdum. Quisque vitae accumsan lectus. Ut nisi turpis, sollicitudin ut dignissim id, fermentum ac est. Maecenas nec libero leo. Sed ac leo eget ipsum ultricies viverra sit amet eu orci. Praesent et tortor risus, viverra accumsan sapien. Sed faucibus eleifend lectus, sed euismod urna porta eu. Quisque vitae accumsan lectus. Ut nisi turpis, sollicitudin ut dignissim id, fermentum ac est. Maecenas nec libero leo. Sed ac leo eget ipsum ultricies viverra sit amet eu orci." //! [layout] onLineLaidOut: { -- cgit v1.2.3