diff --git a/.gitignore b/.gitignore index 987693b93d504f8c105d6aac26ef38e60bba77aa..b2622fb7b9991678e2f18c8893fe36a4d7990039 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ # This file is used to ignore files which are generated in the Qt build system # ---------------------------------------------------------------------------- -examples/quick/controls/ApplicationTemplate/application examples/quick/controls/text/text tests/auto/activeFocusOnTab/tst_activeFocusOnTab tests/auto/controls/tst_controls diff --git a/examples/quick/controls/ApplicationTemplate/ApplicationTemplate.pro b/examples/quick/controls/ApplicationTemplate/ApplicationTemplate.pro deleted file mode 100644 index f877756dccde60ffdd7a3124669eb5967f8bba15..0000000000000000000000000000000000000000 --- a/examples/quick/controls/ApplicationTemplate/ApplicationTemplate.pro +++ /dev/null @@ -1,16 +0,0 @@ -QT += qml quick widgets -CONFIG += console -TARGET = application -SOURCES += \ - main.cpp - -OTHER_FILES += \ - qml/main.qml - -RESOURCES += \ - resources.qrc - -MOC_DIR = ./.moc -OBJECTS_DIR = ./.obj -UI_DIR = ./.ui -RCC_DIR = ./.rcc diff --git a/examples/quick/controls/ApplicationTemplate/main.cpp b/examples/quick/controls/ApplicationTemplate/main.cpp deleted file mode 100644 index ef8dd80485187fdd2b15959e6bcc433cdfde9417..0000000000000000000000000000000000000000 --- a/examples/quick/controls/ApplicationTemplate/main.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Quick Controls module 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 <QtWidgets/QApplication> -#include <QtQml> -#include <QtQuick/QQuickView> - - -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); - QQmlEngine engine; - QQmlComponent component(&engine); - component.loadUrl(QUrl("qrc:/qml/main.qml")); - if ( !component.isReady() ) { - qWarning("%s", qPrintable(component.errorString())); - return -1; - } - QObject *topLevel = component.create(); - QQuickWindow *window = qobject_cast<QQuickWindow *>(topLevel); - if ( !window ) { - qWarning("Error: Your root item has to be a Window."); - return -1; - } - QObject::connect(&engine, SIGNAL(quit()), &app, SLOT(quit())); - window->show(); - return app.exec(); -} diff --git a/examples/quick/controls/ApplicationTemplate/qml/images/qt_icon.png b/examples/quick/controls/ApplicationTemplate/qml/images/qt_icon.png deleted file mode 100644 index 229cdb006efcb67a291f46a52377bcd1d6172f44..0000000000000000000000000000000000000000 Binary files a/examples/quick/controls/ApplicationTemplate/qml/images/qt_icon.png and /dev/null differ diff --git a/examples/quick/controls/ApplicationTemplate/qml/main.qml b/examples/quick/controls/ApplicationTemplate/qml/main.qml deleted file mode 100644 index 0c92e9cad35e12cf2d360b454f0b27c405bb31e3..0000000000000000000000000000000000000000 --- a/examples/quick/controls/ApplicationTemplate/qml/main.qml +++ /dev/null @@ -1,86 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Quick Controls module 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.Controls 1.0 -import QtQuick.Layouts 1.0 - -ApplicationWindow { - width: 640 - height: 480 - minimumWidth: 400 - minimumHeight: 300 - - menuBar: MenuBar { - Menu { - title: "File" - MenuItem { text: "Quit"; onTriggered: Qt.quit() } - } - Menu { - title: "Help" - MenuItem { text: "About..."; enabled: false } - } - } - - toolBar: ToolBar { - RowLayout { - ToolButton { iconSource: "qrc:images/qt_icon.png" } - ToolButton { iconSource: "qrc:images/qt_icon.png" } - } - } - - SplitView { - anchors.fill: parent - TableView { - frameVisible: false - highlightOnFocus: false - model: 40 - TableViewColumn { title: "Left Column" } - } - TextArea { - frameVisible: false - highlightOnFocus: false - text: "Hello World" - } - } -} diff --git a/examples/quick/controls/ApplicationTemplate/resources.qrc b/examples/quick/controls/ApplicationTemplate/resources.qrc deleted file mode 100644 index dfdba433d19401660b3a541999ddcc092caef8cb..0000000000000000000000000000000000000000 --- a/examples/quick/controls/ApplicationTemplate/resources.qrc +++ /dev/null @@ -1,6 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>qml/main.qml</file> - <file>qml/images/qt_icon.png</file> - </qresource> -</RCC> diff --git a/examples/quick/controls/controls.pro b/examples/quick/controls/controls.pro index bccdb5b99bc2de115d53f8d4093d288dce7e13c4..405c239e23144b39e25b94f24c923baa26d8018e 100644 --- a/examples/quick/controls/controls.pro +++ b/examples/quick/controls/controls.pro @@ -8,6 +8,5 @@ SUBDIRS += \ basiclayouts qtHaveModule(widgets) { - SUBDIRS += text \ - ApplicationTemplate + SUBDIRS += text } diff --git a/src/controls/doc/src/qtquickcontrols-examples.qdoc b/src/controls/doc/src/qtquickcontrols-examples.qdoc index 857a1618a1132633166a262ecd0eeb78b1fac6db..229f10cdc408137bef518fe1ef8fec98c997456d 100644 --- a/src/controls/doc/src/qtquickcontrols-examples.qdoc +++ b/src/controls/doc/src/qtquickcontrols-examples.qdoc @@ -70,17 +70,6 @@ vertically with a draggable splitter between each item. */ -/*! - \example ApplicationTemplate - \title Qt Quick Controls - Application Template - \ingroup qtquickcontrols_examples - \brief A simple application template with a few basic UI components. - \image qtquickcontrols-example-applicationtemplate.png - - This is a simple, easily extensible template project for a - desktop application using \l{Qt Quick Controls}. -*/ - /*! \example tableview \title Qt Quick Controls - Table View Example