From 5b0935a10599fbdf9c1df383044ba1e59eec0058 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 12 Mar 2014 12:05:10 +0100 Subject: Move Qt Quick Widgets example and document it Because QtQuickWidgets is part of Qt Quick module documentation, its examples need to also be moved under the examples/quick directory structure. This change moves the example, creates minimal documentation for it, and adds a link to it from the QQuickWidget class reference. Task-number: QTBUG-37272 Change-Id: Iffb67849f150b9aaf0edaef5852364e93f7752b8 Reviewed-by: Jerome Pasion Reviewed-by: Lars Knoll --- examples/quick/quick.pro | 3 +- .../doc/images/qtquickwidgets-example.png | Bin 0 -> 11340 bytes .../quickwidget/doc/src/quickwidget.qdoc | 34 +++++++ examples/quick/quickwidgets/quickwidget/main.cpp | 112 +++++++++++++++++++++ .../quickwidget/qtquickwidgets-example.png | Bin 0 -> 11340 bytes .../quick/quickwidgets/quickwidget/quickwidget.pro | 8 ++ .../quick/quickwidgets/quickwidget/quickwidget.qrc | 5 + .../quickwidgets/quickwidget/rotatingsquare.qml | 60 +++++++++++ examples/quick/quickwidgets/quickwidgets.pro | 2 + 9 files changed, 223 insertions(+), 1 deletion(-) create mode 100644 examples/quick/quickwidgets/quickwidget/doc/images/qtquickwidgets-example.png create mode 100644 examples/quick/quickwidgets/quickwidget/doc/src/quickwidget.qdoc create mode 100644 examples/quick/quickwidgets/quickwidget/main.cpp create mode 100644 examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png create mode 100644 examples/quick/quickwidgets/quickwidget/quickwidget.pro create mode 100644 examples/quick/quickwidgets/quickwidget/quickwidget.qrc create mode 100644 examples/quick/quickwidgets/quickwidget/rotatingsquare.qml create mode 100644 examples/quick/quickwidgets/quickwidgets.pro (limited to 'examples/quick') diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro index 1f96111b04..f39931bd94 100644 --- a/examples/quick/quick.pro +++ b/examples/quick/quick.pro @@ -26,7 +26,8 @@ SUBDIRS = quick-accessibility \ # Widget dependent examples qtHaveModule(widgets) { - SUBDIRS += embeddedinwidgets + SUBDIRS += embeddedinwidgets \ + quickwidgets } EXAMPLE_FILES = \ diff --git a/examples/quick/quickwidgets/quickwidget/doc/images/qtquickwidgets-example.png b/examples/quick/quickwidgets/quickwidget/doc/images/qtquickwidgets-example.png new file mode 100644 index 0000000000..cc4f52082f Binary files /dev/null and b/examples/quick/quickwidgets/quickwidget/doc/images/qtquickwidgets-example.png differ diff --git a/examples/quick/quickwidgets/quickwidget/doc/src/quickwidget.qdoc b/examples/quick/quickwidgets/quickwidget/doc/src/quickwidget.qdoc new file mode 100644 index 0000000000..8a89371039 --- /dev/null +++ b/examples/quick/quickwidgets/quickwidget/doc/src/quickwidget.qdoc @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** Copyright (C) 2014 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 Qt Quick Widgets Example + \example quickwidgets/quickwidget + \brief Demonstrates how to mix QML with a Qt Widgets application using the QQuickWidget class. + \image qtquickwidgets-example.png +*/ + diff --git a/examples/quick/quickwidgets/quickwidget/main.cpp b/examples/quick/quickwidgets/quickwidget/main.cpp new file mode 100644 index 0000000000..c1304347ec --- /dev/null +++ b/examples/quick/quickwidgets/quickwidget/main.cpp @@ -0,0 +1,112 @@ +/**************************************************************************** +** +** Copyright (C) 2014 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$ +** +****************************************************************************/ + +#include +#include +#include + +class MainWindow : public QMainWindow { + Q_OBJECT +public: + MainWindow(); + +private slots: + void quickWidgetStatusChanged(QQuickWidget::Status); + void sceneGraphError(QQuickWindow::SceneGraphError error, const QString &message); + +private: + QQuickWidget *m_quickWidget; +}; + +MainWindow::MainWindow() + : m_quickWidget(new QQuickWidget) +{ + QMdiArea *centralWidget = new QMdiArea; + + QLCDNumber *lcd = new QLCDNumber; + lcd->display(1337); + lcd->setMinimumSize(250,100); + centralWidget ->addSubWindow(lcd); + + QUrl source("qrc:quickwidget/rotatingsquare.qml"); + + connect(m_quickWidget, SIGNAL(statusChanged(QQuickWidget::Status)), + this, SLOT(quickWidgetStatusChanged(QQuickWidget::Status))); + connect(m_quickWidget, SIGNAL(sceneGraphError(QQuickWindow::SceneGraphError,QString)), + this, SLOT(sceneGraphError(QQuickWindow::SceneGraphError,QString))); + m_quickWidget->resize(300,300); + m_quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView ); + m_quickWidget->setSource(source); + + centralWidget ->addSubWindow(m_quickWidget); + + setCentralWidget(centralWidget); + + QMenu *fileMenu = menuBar()->addMenu(tr("File")); + QAction *quitAction = fileMenu->addAction(tr("Quit")); + connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); +} + +void MainWindow::quickWidgetStatusChanged(QQuickWidget::Status status) +{ + if (status == QQuickWidget::Error) { + QStringList errors; + foreach (const QQmlError &error, m_quickWidget->errors()) + errors.append(error.toString()); + statusBar()->showMessage(errors.join(QStringLiteral(", "))); + } +} + +void MainWindow::sceneGraphError(QQuickWindow::SceneGraphError, const QString &message) +{ + statusBar()->showMessage(message); +} + +int main(int argc, char **argv) +{ + QApplication app(argc, argv); + + MainWindow mainWindow; + mainWindow.show(); + + return app.exec(); +} + +#include "main.moc" diff --git a/examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png b/examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png new file mode 100644 index 0000000000..cc4f52082f Binary files /dev/null and b/examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png differ diff --git a/examples/quick/quickwidgets/quickwidget/quickwidget.pro b/examples/quick/quickwidgets/quickwidget/quickwidget.pro new file mode 100644 index 0000000000..1aca22082e --- /dev/null +++ b/examples/quick/quickwidgets/quickwidget/quickwidget.pro @@ -0,0 +1,8 @@ +QT += core gui quick widgets quickwidgets + +TARGET = quickwidget +TEMPLATE = app + +SOURCES += main.cpp + +RESOURCES += quickwidget.qrc diff --git a/examples/quick/quickwidgets/quickwidget/quickwidget.qrc b/examples/quick/quickwidgets/quickwidget/quickwidget.qrc new file mode 100644 index 0000000000..c073b7b80d --- /dev/null +++ b/examples/quick/quickwidgets/quickwidget/quickwidget.qrc @@ -0,0 +1,5 @@ + + + rotatingsquare.qml + + diff --git a/examples/quick/quickwidgets/quickwidget/rotatingsquare.qml b/examples/quick/quickwidgets/quickwidget/rotatingsquare.qml new file mode 100644 index 0000000000..a5becfba38 --- /dev/null +++ b/examples/quick/quickwidgets/quickwidget/rotatingsquare.qml @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** Copyright (C) 2014 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: root + + Rectangle { + property int d: 100 + id: square + width: d + height: d + anchors.centerIn: parent + color: "red" + NumberAnimation on rotation { from: 0; to: 360; duration: 2000; loops: Animation.Infinite; } + } + + Text { + anchors.centerIn: parent + text: "Qt Quick running in a widget" + } +} diff --git a/examples/quick/quickwidgets/quickwidgets.pro b/examples/quick/quickwidgets/quickwidgets.pro new file mode 100644 index 0000000000..07192b6696 --- /dev/null +++ b/examples/quick/quickwidgets/quickwidgets.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = quickwidget -- cgit v1.2.3