diff options
author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2018-08-30 14:49:19 +0200 |
---|---|---|
committer | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2018-09-06 11:17:56 +0000 |
commit | 3e27cb8dd5fc7ff238946d9b96891e40cf9981f9 (patch) | |
tree | f32cc5151dfad19490c2e0ff95935b6c36e13dc7 /tests | |
parent | 43b5b2bda66dea6c47eb55525341d703b4e22652 (diff) |
QQuickTableView: add anchor check for delegate
If a delegate is using anchors, TableView will not be able
to layout the item. So issue a warning if that is the
case.
Change-Id: I358d981067c23fdab2fc486003afc8bd685f940d
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/quick/qquicktableview/data/delegatewithanchors.qml | 65 | ||||
-rw-r--r-- | tests/auto/quick/qquicktableview/tst_qquicktableview.cpp | 13 |
2 files changed, 78 insertions, 0 deletions
diff --git a/tests/auto/quick/qquicktableview/data/delegatewithanchors.qml b/tests/auto/quick/qquicktableview/data/delegatewithanchors.qml new file mode 100644 index 0000000000..0b549f09a4 --- /dev/null +++ b/tests/auto/quick/qquicktableview/data/delegatewithanchors.qml @@ -0,0 +1,65 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtQuick module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** 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-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.12 +import QtQuick.Window 2.3 + +Item { + width: 640 + height: 450 + + property alias tableView: tableView + + TableView { + id: tableView + width: 600 + height: 400 + delegate: tableViewDelegate + } + + Component { + id: tableViewDelegate + Rectangle { + anchors.fill: parent + implicitWidth: 100 + implicitHeight: 100 + } + } + +} diff --git a/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp b/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp index 29eb61b7ad..4ba36cd687 100644 --- a/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp +++ b/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp @@ -93,6 +93,7 @@ private slots: void checkZeroSizedDelegate(); void checkImplicitSizeDelegate(); void checkColumnWidthWithoutProvider(); + void checkDelegateWithAnchors(); void checkColumnWidthProvider(); void checkColumnWidthProviderInvalidReturnValues(); void checkColumnWidthProviderNotCallable(); @@ -308,6 +309,18 @@ void tst_QQuickTableView::checkColumnWidthWithoutProvider() } } +void tst_QQuickTableView::checkDelegateWithAnchors() +{ + // Checks that we issue a warning if the delegate has anchors + LOAD_TABLEVIEW("delegatewithanchors.qml"); + + QTest::ignoreMessage(QtWarningMsg, QRegularExpression(".*anchors")); + + auto model = TestModelAsVariant(1, 1); + tableView->setModel(model); + WAIT_UNTIL_POLISHED; +} + void tst_QQuickTableView::checkColumnWidthProvider() { // Check that you can assign a function to the columnWidthProvider property, and |