41eefd7493
... as it has outlived its original purpose: Qt3 implementation on X11: void QApplication::flush() { flushX(); } void QApplication::flushX() { if (appDpy) XFlush( appDpy ); } Qt4 implementation on X11: Did nothing when QApplication::flush() was called (the flush() overrides in {unix,glib} event dispatchers with empty bodies). In Qt5 this function somehow has been repurposed (inconsistently) to do what QCoreApplication::sendPostedEvents already does: QAbstractEventDispatcher::flush() = 0; => QCocoaEventDispatcher::flush() {} => QEventDispatcherCoreFoundation::flush() {} => QIOSEventDispatcher (does not override ::flush()) => QEventDispatcherGlib::flush() {} => QPAEventDispatcherGlib (does not override ::flush()) => QEventDispatcherUNIX::flush() {} => QUnixEventDispatcherQPA (when QT_NO_GLIB=true) ::flush() { if (qApp) qApp->sendPostedEvents(); }) ==> QAndroidEventDispatcher (does not override ::flush()) => QEventDispatcherWin32::flush() {} => QOffscreenEventDispatcher::flush() { if (qApp) qApp->sendPostedEvents(); QEventDispatcherWin32::flush(); } => QWindowsGuiEventDispatcher (does not override ::flush()) => QWindowsDirect2DEventDispatcher (does not override ::flush()) => QEventDispatcherWinRT::flush() {} => QOffscreenEventDispatcher::flush() { if (qApp) qApp->sendPostedEvents(); QEventDispatcherWinRT::flush(); } => QWinRTEventDispatcher (qminimaleglintegration.cpp) (does not override ::flush()) => QWinRTEventDispatcher (qwinrteventdispatcher.h) (does not override ::flush()) Whatever this function was doing on macOS in Qt3 and Qt4 also has been dropped in Qt5. It appears that the other event dispatchers in Qt5 that have overrides for flush() have simply copy-pasted this logic. Clearly the documentation of QCoreApplication::flush() is outdated and has nothing to do with the actual implementation in Qt5. This function is rarely used in Qt5 sources. It should be safe to remove the calls to QCoreApplication::flush() from Qt source code, as this function has been doing nothing on most platforms anyways. Repurposing it even broke handling of posted events (see QTBUG-48717). [ChangeLog][QtCore][Event loop] QCoreApplication::flush() is now deprecated. Use QCoreApplication::processEvents() and QCoreApplication::sendPostedEvents() instead. Task-number: QTBUG-33489 Task-number: QTBUG-48717 Change-Id: Icc7347ff203024b7153ea74be6bf527dd07ce821 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Gunnar Sletta <gunnar@crimson.no>
244 lines
6.7 KiB
C++
244 lines
6.7 KiB
C++
/****************************************************************************
|
|
**
|
|
** 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: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 https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** 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$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include <qtest.h>
|
|
|
|
#include <QtWidgets/QLayout>
|
|
#include <QtGui/QPainter>
|
|
|
|
static void processEvents()
|
|
{
|
|
QApplication::processEvents();
|
|
QApplication::processEvents();
|
|
}
|
|
|
|
class UpdateWidget : public QWidget
|
|
{
|
|
public:
|
|
UpdateWidget(int rows, int columns)
|
|
: QWidget(0), rowCount(0), columnCount(0), opaqueChildren(false)
|
|
{
|
|
fill(rows, columns);
|
|
}
|
|
|
|
UpdateWidget(QWidget *parent = 0)
|
|
: QWidget(parent), rowCount(0), columnCount(0), opaqueChildren(false) {}
|
|
|
|
void fill(int rows, int columns)
|
|
{
|
|
if (rows == rowCount && columns == columnCount)
|
|
return;
|
|
delete layout();
|
|
QGridLayout *layout = new QGridLayout;
|
|
rowCount = rows;
|
|
columnCount = columns;
|
|
for (int row = 0; row < rowCount; ++row) {
|
|
for (int column = 0; column < columnCount; ++column) {
|
|
UpdateWidget *widget = new UpdateWidget;
|
|
widget->setFixedSize(20, 20);
|
|
layout->addWidget(widget, row, column);
|
|
children.append(widget);
|
|
}
|
|
}
|
|
setLayout(layout);
|
|
adjustSize();
|
|
QTest::qWait(250);
|
|
processEvents();
|
|
}
|
|
|
|
void setOpaqueChildren(bool enable)
|
|
{
|
|
if (opaqueChildren != enable) {
|
|
foreach (QWidget *w, children)
|
|
w->setAttribute(Qt::WA_OpaquePaintEvent, enable);
|
|
opaqueChildren = enable;
|
|
processEvents();
|
|
}
|
|
}
|
|
|
|
void paintEvent(QPaintEvent *)
|
|
{
|
|
static int color = Qt::black;
|
|
|
|
QPainter painter(this);
|
|
painter.fillRect(rect(), Qt::GlobalColor(color));
|
|
|
|
if (++color > Qt::darkYellow)
|
|
color = Qt::black;
|
|
}
|
|
|
|
QRegion updateRegion;
|
|
QList<UpdateWidget*> children;
|
|
int rowCount;
|
|
int columnCount;
|
|
bool opaqueChildren;
|
|
};
|
|
|
|
class tst_QWidget : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public slots:
|
|
void initTestCase();
|
|
void init();
|
|
|
|
private slots:
|
|
void update_data();
|
|
void update();
|
|
void updatePartial_data();
|
|
void updatePartial();
|
|
void updateComplex_data();
|
|
void updateComplex();
|
|
|
|
private:
|
|
UpdateWidget widget;
|
|
};
|
|
|
|
void tst_QWidget::initTestCase()
|
|
{
|
|
widget.show();
|
|
QTest::qWaitForWindowExposed(&widget);
|
|
QTest::qWait(300);
|
|
processEvents();
|
|
}
|
|
|
|
void tst_QWidget::init()
|
|
{
|
|
QVERIFY(widget.isVisible());
|
|
for (int i = 0; i < 3; ++i)
|
|
processEvents();
|
|
}
|
|
|
|
void tst_QWidget::update_data()
|
|
{
|
|
QTest::addColumn<int>("rows");
|
|
QTest::addColumn<int>("columns");
|
|
QTest::addColumn<int>("numUpdates");
|
|
QTest::addColumn<bool>("opaque");
|
|
|
|
QTest::newRow("10x10x1 transparent") << 10 << 10 << 1 << false;
|
|
QTest::newRow("10x10x10 transparent") << 10 << 10 << 10 << false;
|
|
QTest::newRow("10x10x100 transparent") << 10 << 10 << 100 << false;
|
|
QTest::newRow("10x10x1 opaque") << 10 << 10 << 1 << true;
|
|
QTest::newRow("10x10x10 opaque") << 10 << 10 << 10 << true;
|
|
QTest::newRow("10x10x100 opaque") << 10 << 10 << 100 << true;
|
|
QTest::newRow("25x25x1 transparent ") << 25 << 25 << 1 << false;
|
|
QTest::newRow("25x25x10 transparent") << 25 << 25 << 10 << false;
|
|
QTest::newRow("25x25x100 transparent") << 25 << 25 << 100 << false;
|
|
QTest::newRow("25x25x1 opaque") << 25 << 25 << 1 << true;
|
|
QTest::newRow("25x25x10 opaque") << 25 << 25 << 10 << true;
|
|
QTest::newRow("25x25x100 opaque") << 25 << 25 << 100 << true;
|
|
}
|
|
|
|
void tst_QWidget::update()
|
|
{
|
|
QFETCH(int, rows);
|
|
QFETCH(int, columns);
|
|
QFETCH(int, numUpdates);
|
|
QFETCH(bool, opaque);
|
|
|
|
widget.fill(rows, columns);
|
|
widget.setOpaqueChildren(opaque);
|
|
|
|
QBENCHMARK {
|
|
for (int i = 0; i < widget.children.size(); ++i) {
|
|
for (int j = 0; j < numUpdates; ++j)
|
|
widget.children.at(i)->update();
|
|
QApplication::processEvents();
|
|
}
|
|
}
|
|
|
|
QApplication::processEvents();
|
|
}
|
|
|
|
void tst_QWidget::updatePartial_data()
|
|
{
|
|
update_data();
|
|
}
|
|
|
|
void tst_QWidget::updatePartial()
|
|
{
|
|
QFETCH(int, rows);
|
|
QFETCH(int, columns);
|
|
QFETCH(int, numUpdates);
|
|
QFETCH(bool, opaque);
|
|
|
|
widget.fill(rows, columns);
|
|
widget.setOpaqueChildren(opaque);
|
|
|
|
QBENCHMARK {
|
|
for (int i = 0; i < widget.children.size(); ++i) {
|
|
QWidget *w = widget.children[i];
|
|
const int x = w->width() / 2;
|
|
const int y = w->height() / 2;
|
|
for (int j = 0; j < numUpdates; ++j) {
|
|
w->update(0, 0, x, y);
|
|
w->update(x, 0, x, y);
|
|
w->update(0, y, x, y);
|
|
w->update(x, y, x, y);
|
|
}
|
|
QApplication::processEvents();
|
|
}
|
|
}
|
|
}
|
|
|
|
void tst_QWidget::updateComplex_data()
|
|
{
|
|
update_data();
|
|
}
|
|
|
|
void tst_QWidget::updateComplex()
|
|
{
|
|
QFETCH(int, rows);
|
|
QFETCH(int, columns);
|
|
QFETCH(int, numUpdates);
|
|
QFETCH(bool, opaque);
|
|
|
|
widget.fill(rows, columns);
|
|
widget.setOpaqueChildren(opaque);
|
|
|
|
QBENCHMARK {
|
|
for (int i = 0; i < widget.children.size(); ++i) {
|
|
QWidget *w = widget.children[i];
|
|
const int x = w->width() / 2;
|
|
const int y = w->height() / 2;
|
|
QRegion r1(0, 0, x, y, QRegion::Ellipse);
|
|
QRegion r2(x, y, x, y, QRegion::Ellipse);
|
|
for (int j = 0; j < numUpdates; ++j) {
|
|
w->update(r1);
|
|
w->update(r2);
|
|
}
|
|
QApplication::processEvents();
|
|
}
|
|
}
|
|
}
|
|
|
|
QTEST_MAIN(tst_QWidget)
|
|
|
|
#include "tst_qwidget.moc"
|