983dde1f2f
Widgets and layouts added or inserted to a layout are checked for: - Not being NULL - Not being the parent widget of a layout or the layout itself, respectively Without this commit, adding a widget to its own layout would result in a CPU-hogging infinite loop. Now, a warning is written to stderr and the add or insert function call is ignored. The checks are implemented as public functions of QLayoutPrivate and thus accessible in QLayout's descendants to be used in various "addWidget", "insertWidget", etc functions. Unlike 'classical' layouts like QGridLayout, QFormLayout does indeed accept widgets that are NULL. To not break this behavior, any call for the check functions first tests if the widget or layout, respectively, to test is NULL or not and calls the check only in the latter case. Automated tests for QBoxLayout, QGridLayout, and QFormLayout were added. For an unpatched Qt 5.3, each of those automated tests will freeze as explained in QTBUG-40609. For a fixed version, warning messages about invalid parameters to addWidget/addLayout/... calls will be read by QTest::ignoreMessage, resulting in a passed test. Change-Id: I1522d5727e643da3f7c025755975aca9f482676d Task-number: QTBUG-40609 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
79 lines
3.2 KiB
C++
79 lines
3.2 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
|
** Contact: http://www.qt-project.org/legal
|
|
**
|
|
** This file is part of the test suite 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 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 Lesser General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
** General Public License version 2.1 as published by the Free Software
|
|
** Foundation and appearing in the file LICENSE.LGPL included in the
|
|
** packaging of this file. Please review the following information to
|
|
** ensure the GNU Lesser General Public License version 2.1 requirements
|
|
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, Digia gives you certain additional
|
|
** rights. These rights are described in the Digia Qt 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.0 as published by the Free Software
|
|
** Foundation and appearing in the file LICENSE.GPL included in the
|
|
** packaging of this file. Please review the following information to
|
|
** ensure the GNU General Public License version 3.0 requirements will be
|
|
** met: http://www.gnu.org/copyleft/gpl.html.
|
|
**
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "hbwidget.h"
|
|
#include <QHBoxLayout>
|
|
#include <QPushButton>
|
|
#include <QComboBox>
|
|
#include <QDateTimeEdit>
|
|
#include <QLineEdit>
|
|
#include <QSpinBox>
|
|
#include <QLabel>
|
|
#include <QCheckBox>
|
|
|
|
HbWidget::HbWidget(QWidget *parent) :
|
|
QWidget(parent)
|
|
{
|
|
QHBoxLayout *hb = new QHBoxLayout(this);
|
|
hb->setObjectName("HbWidget");
|
|
QComboBox *combo = new QComboBox(this);
|
|
combo->addItem("123");
|
|
QComboBox *combo2 = new QComboBox();
|
|
combo2->setEditable(true);
|
|
combo2->addItem("123");
|
|
|
|
hb->addWidget(new QLabel("123"));
|
|
hb->addWidget(new QLineEdit("123"));
|
|
hb->addWidget(combo);
|
|
hb->addWidget(combo2);
|
|
hb->addWidget(new QCheckBox("123"));
|
|
hb->addWidget(new QDateTimeEdit());
|
|
hb->addWidget(new QPushButton("123"));
|
|
hb->addWidget(new QSpinBox());
|
|
|
|
qDebug("There should be four warnings, but no crash or freeze:");
|
|
hb->addWidget(this); ///< This command should print a warning, but should not add "this"
|
|
hb->addWidget(Q_NULLPTR); ///< This command should print a warning, but should not add "NULL"
|
|
hb->addLayout(hb); ///< This command should print a warning, but should not add "hb"
|
|
hb->addLayout(Q_NULLPTR); ///< This command should print a warning, but should not add "NULL"
|
|
qDebug("Neither crashed nor frozen");
|
|
}
|