diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 20:32:26 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 20:32:26 +0100 |
commit | 501d45012f746d843e0144c78202297a577758bc (patch) | |
tree | 5c2b125327d49e3495b5f47995d93fb4215acbb4 /tests/manual | |
parent | 9e1b044afa994cdd77fd256cea78cd144e804d76 (diff) | |
parent | 442843db6f5dce6b594448d43b380c9b884a7c91 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/quickcontrols2/qquickchecklabel.cpp
src/quickcontrols2/qquickchecklabel_p.h
src/quickcontrols2/qquickmnemoniclabel_p.h
src/quicktemplates2/qquickbuttongroup_p.h
src/quicktemplates2/qquickspinbox.cpp
src/quicktemplates2/qquickswipedelegate.cpp
Change-Id: I1278b78dcaf25be5698f34751193b83dc951eb3c
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/manual.pro | 2 | ||||
-rw-r--r-- | tests/manual/systemtrayicon/images/qt_logo_green_256.png | bin | 0 -> 3977 bytes | |||
-rw-r--r-- | tests/manual/systemtrayicon/systemtrayicon.cpp | 64 | ||||
-rw-r--r-- | tests/manual/systemtrayicon/systemtrayicon.pro | 9 | ||||
-rw-r--r-- | tests/manual/systemtrayicon/systemtrayicon.qml | 89 | ||||
-rw-r--r-- | tests/manual/systemtrayicon/systemtrayicon.qrc | 6 | ||||
-rw-r--r-- | tests/manual/viewinqwidget/main.cpp | 6 | ||||
-rw-r--r-- | tests/manual/viewinqwidget/viewinqwidget.pro | 4 |
8 files changed, 176 insertions, 4 deletions
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index d81ea32f..d23b4494 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -7,4 +7,6 @@ SUBDIRS += \ styles \ testbench +qtConfig(systemtrayicon): SUBDIRS += systemtrayicon + qtHaveModule(widgets): SUBDIRS += viewinqwidget diff --git a/tests/manual/systemtrayicon/images/qt_logo_green_256.png b/tests/manual/systemtrayicon/images/qt_logo_green_256.png Binary files differnew file mode 100644 index 00000000..92243fd5 --- /dev/null +++ b/tests/manual/systemtrayicon/images/qt_logo_green_256.png diff --git a/tests/manual/systemtrayicon/systemtrayicon.cpp b/tests/manual/systemtrayicon/systemtrayicon.cpp new file mode 100644 index 00000000..1866a269 --- /dev/null +++ b/tests/manual/systemtrayicon/systemtrayicon.cpp @@ -0,0 +1,64 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, 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 The Qt Company Ltd 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 <QGuiApplication> +#include <QQmlApplicationEngine> + +int main(int argc, char *argv[]) +{ + QGuiApplication app(argc, argv); + + QQmlApplicationEngine engine; + engine.load(QUrl("qrc:/files/systemtrayicon.qml")); + if (engine.rootObjects().isEmpty()) + return -1; + + return app.exec(); +} diff --git a/tests/manual/systemtrayicon/systemtrayicon.pro b/tests/manual/systemtrayicon/systemtrayicon.pro new file mode 100644 index 00000000..24b9caa0 --- /dev/null +++ b/tests/manual/systemtrayicon/systemtrayicon.pro @@ -0,0 +1,9 @@ +TEMPLATE = app +TARGET = systemtrayicon +QT += quick quickcontrols2 + +SOURCES += \ + systemtrayicon.cpp + +RESOURCES += \ + systemtrayicon.qrc diff --git a/tests/manual/systemtrayicon/systemtrayicon.qml b/tests/manual/systemtrayicon/systemtrayicon.qml new file mode 100644 index 00000000..8431ab30 --- /dev/null +++ b/tests/manual/systemtrayicon/systemtrayicon.qml @@ -0,0 +1,89 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, 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 The Qt Company Ltd 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.10 +import QtQuick.Controls 2.3 +import Qt.labs.platform 1.0 + +ApplicationWindow { + id: window + + visible: true + title: "Qt Quick Controls 2 - System Tray Icon" + + MenuBar { + id: menuBar + + Menu { + id: fileMenu + title: qsTr("File") + + MenuItem { + id : quitItem + text : "Quit" + onTriggered: Qt.quit() + } + } + } + + SystemTrayIcon { + visible: true + iconSource: "qrc:/files/images/qt_logo_green_256.png" + + menu: Menu { + MenuItem { + text: qsTr("Quit") + onTriggered: Qt.quit() + } + } + + onActivated: console.log("Activated") + } +} diff --git a/tests/manual/systemtrayicon/systemtrayicon.qrc b/tests/manual/systemtrayicon/systemtrayicon.qrc new file mode 100644 index 00000000..656476d9 --- /dev/null +++ b/tests/manual/systemtrayicon/systemtrayicon.qrc @@ -0,0 +1,6 @@ +<RCC> + <qresource prefix="/files"> + <file>systemtrayicon.qml</file> + <file>images/qt_logo_green_256.png</file> + </qresource> +</RCC> diff --git a/tests/manual/viewinqwidget/main.cpp b/tests/manual/viewinqwidget/main.cpp index c7050bc1..80cbb415 100644 --- a/tests/manual/viewinqwidget/main.cpp +++ b/tests/manual/viewinqwidget/main.cpp @@ -39,6 +39,7 @@ #include <QVBoxLayout> #include <QDebug> #include <QDesktopWidget> +#include <QDir> #include <QGroupBox> #include <QQmlApplicationEngine> #include <QQmlError> @@ -66,8 +67,9 @@ int main(int argc, char *argv[]) } hLayout->addWidget(groupBox); - const QUrl gallerySource(QLatin1String("qrc:/gallery.qml")); - QQmlApplicationEngine engine(gallerySource); + const QString gallerySource = + QDir::cleanPath(QLatin1String(SRCDIR"../../../examples/quickcontrols2/gallery/gallery.qml")); + QQmlApplicationEngine engine(QUrl::fromLocalFile(gallerySource)); QObject *root = engine.rootObjects().value(0, nullptr); if (!root || !root->isWindowType()) { qWarning() << "Load error" << gallerySource; diff --git a/tests/manual/viewinqwidget/viewinqwidget.pro b/tests/manual/viewinqwidget/viewinqwidget.pro index 9b7cba00..649829d4 100644 --- a/tests/manual/viewinqwidget/viewinqwidget.pro +++ b/tests/manual/viewinqwidget/viewinqwidget.pro @@ -2,5 +2,5 @@ QT += qml quick widgets quickwidgets TARGET = viewinqwidget SOURCES += $$PWD/main.cpp OTHER_FILES += main.qml -RESOURCES += viewinqwidget.qrc \ - ../../../examples/controls/gallery/gallery.qrc +RESOURCES += viewinqwidget.qrc +DEFINES += SRCDIR=\\\"$$PWD/\\\" |