diff options
Diffstat (limited to 'tests/auto/quick/qquickrectangle')
-rw-r--r-- | tests/auto/quick/qquickrectangle/data/color.qml | 8 | ||||
-rw-r--r-- | tests/auto/quick/qquickrectangle/qquickrectangle.pro | 1 | ||||
-rw-r--r-- | tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp | 46 |
3 files changed, 37 insertions, 18 deletions
diff --git a/tests/auto/quick/qquickrectangle/data/color.qml b/tests/auto/quick/qquickrectangle/data/color.qml new file mode 100644 index 0000000000..56b83d11c7 --- /dev/null +++ b/tests/auto/quick/qquickrectangle/data/color.qml @@ -0,0 +1,8 @@ +import QtQuick 2.0 + +Rectangle { + width: 100 + height: 100 + color: '#020202' +} + diff --git a/tests/auto/quick/qquickrectangle/qquickrectangle.pro b/tests/auto/quick/qquickrectangle/qquickrectangle.pro index e881926c80..daefb5fe75 100644 --- a/tests/auto/quick/qquickrectangle/qquickrectangle.pro +++ b/tests/auto/quick/qquickrectangle/qquickrectangle.pro @@ -10,4 +10,3 @@ include (../shared/util.pri) TESTDATA = data/* QT += core-private gui-private qml-private quick-private testlib -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp b/tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp index a7e82e272f..65c7e387a0 100644 --- a/tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp +++ b/tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp @@ -1,31 +1,26 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 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:LGPL21$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ ** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -33,6 +28,7 @@ #include <qtest.h> #include <QtTest/QSignalSpy> +#include <QtGui/qscreen.h> #include <QtQml/qqmlengine.h> #include <QtQml/qqmlcomponent.h> #include <QtQuick/qquickview.h> @@ -47,6 +43,7 @@ public: tst_qquickrectangle(); private slots: + void color(); void gradient(); void gradient_border(); void antialiasing(); @@ -59,6 +56,21 @@ tst_qquickrectangle::tst_qquickrectangle() { } +void tst_qquickrectangle::color() +{ + if (QGuiApplication::primaryScreen()->depth() < 24) + QSKIP("This test does not work at display depths < 24"); + + QQuickView view; + view.setSource(testFileUrl("color.qml")); + view.show(); + + QVERIFY(QTest::qWaitForWindowExposed(&view)); + + QImage image = view.grabWindow(); + QVERIFY(image.pixel(0,0) == QColor("#020202").rgba()); +} + void tst_qquickrectangle::gradient() { QQmlComponent component(&engine, testFileUrl("gradient.qml")); |