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>
235 lines
5.7 KiB
C++
235 lines
5.7 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the test suite module 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 <QGraphicsItem>
|
|
#include <QGraphicsScene>
|
|
#include <QGraphicsView>
|
|
|
|
class tst_QGraphicsItem : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
tst_QGraphicsItem();
|
|
virtual ~tst_QGraphicsItem();
|
|
|
|
public slots:
|
|
void initTestCase();
|
|
void init();
|
|
void cleanup();
|
|
|
|
private slots:
|
|
void setParentItem();
|
|
void setParentItem_deep();
|
|
void setParentItem_deep_reversed();
|
|
void deleteItemWithManyChildren();
|
|
void setPos_data();
|
|
void setPos();
|
|
void setTransform_data();
|
|
void setTransform();
|
|
void rotate();
|
|
void scale();
|
|
void shear();
|
|
void translate();
|
|
};
|
|
|
|
tst_QGraphicsItem::tst_QGraphicsItem()
|
|
{
|
|
}
|
|
|
|
tst_QGraphicsItem::~tst_QGraphicsItem()
|
|
{
|
|
}
|
|
|
|
static inline void processEvents()
|
|
{
|
|
QApplication::processEvents();
|
|
QApplication::processEvents();
|
|
}
|
|
|
|
void tst_QGraphicsItem::initTestCase()
|
|
{
|
|
processEvents();
|
|
QTest::qWait(1500);
|
|
processEvents();
|
|
}
|
|
|
|
void tst_QGraphicsItem::init()
|
|
{
|
|
processEvents();
|
|
}
|
|
|
|
void tst_QGraphicsItem::cleanup()
|
|
{
|
|
}
|
|
|
|
void tst_QGraphicsItem::setParentItem()
|
|
{
|
|
QBENCHMARK {
|
|
QGraphicsRectItem rect;
|
|
QGraphicsRectItem *childRect = new QGraphicsRectItem;
|
|
childRect->setParentItem(&rect);
|
|
}
|
|
}
|
|
|
|
void tst_QGraphicsItem::setParentItem_deep()
|
|
{
|
|
QBENCHMARK {
|
|
QGraphicsRectItem rect;
|
|
QGraphicsRectItem *lastRect = ▭
|
|
for (int i = 0; i < 10; ++i) {
|
|
QGraphicsRectItem *childRect = new QGraphicsRectItem;
|
|
childRect->setParentItem(lastRect);
|
|
lastRect = childRect;
|
|
}
|
|
QGraphicsItem *first = rect.childItems().first();
|
|
first->setParentItem(0);
|
|
}
|
|
}
|
|
|
|
void tst_QGraphicsItem::setParentItem_deep_reversed()
|
|
{
|
|
QBENCHMARK {
|
|
QGraphicsRectItem *lastRect = new QGraphicsRectItem;
|
|
for (int i = 0; i < 100; ++i) {
|
|
QGraphicsRectItem *parentRect = new QGraphicsRectItem;
|
|
lastRect->setParentItem(parentRect);
|
|
lastRect = parentRect;
|
|
}
|
|
delete lastRect;
|
|
}
|
|
}
|
|
|
|
void tst_QGraphicsItem::deleteItemWithManyChildren()
|
|
{
|
|
QBENCHMARK {
|
|
QGraphicsRectItem *rect = new QGraphicsRectItem;
|
|
for (int i = 0; i < 1000; ++i)
|
|
new QGraphicsRectItem(rect);
|
|
delete rect;
|
|
}
|
|
}
|
|
|
|
void tst_QGraphicsItem::setPos_data()
|
|
{
|
|
QTest::addColumn<QPointF>("pos");
|
|
|
|
QTest::newRow("0, 0") << QPointF(0, 0);
|
|
QTest::newRow("10, 10") << QPointF(10, 10);
|
|
QTest::newRow("-10, -10") << QPointF(-10, -10);
|
|
}
|
|
|
|
void tst_QGraphicsItem::setPos()
|
|
{
|
|
QFETCH(QPointF, pos);
|
|
|
|
QGraphicsScene scene;
|
|
QGraphicsRectItem *rect = scene.addRect(QRectF(0, 0, 100, 100));
|
|
processEvents();
|
|
|
|
QBENCHMARK {
|
|
rect->setPos(10, 10);
|
|
}
|
|
}
|
|
|
|
void tst_QGraphicsItem::setTransform_data()
|
|
{
|
|
QTest::addColumn<QTransform>("transform");
|
|
|
|
QTest::newRow("rotate 45z") << QTransform().rotate(45);
|
|
QTest::newRow("scale 2x2") << QTransform().scale(2, 2);
|
|
QTest::newRow("translate 100, 100") << QTransform().translate(100, 100);
|
|
QTest::newRow("rotate 45x 45y 45z") << QTransform().rotate(45, Qt::XAxis)
|
|
.rotate(45, Qt::YAxis).rotate(45, Qt::ZAxis);
|
|
}
|
|
|
|
void tst_QGraphicsItem::setTransform()
|
|
{
|
|
QFETCH(QTransform, transform);
|
|
|
|
QGraphicsScene scene;
|
|
QGraphicsRectItem *item = scene.addRect(QRectF(0, 0, 100, 100));
|
|
processEvents();
|
|
|
|
QBENCHMARK {
|
|
item->setTransform(transform);
|
|
}
|
|
}
|
|
|
|
void tst_QGraphicsItem::rotate()
|
|
{
|
|
QGraphicsScene scene;
|
|
QGraphicsItem *item = scene.addRect(QRectF(0, 0, 100, 100));
|
|
processEvents();
|
|
|
|
const QTransform rotate(QTransform().rotate(45));
|
|
QBENCHMARK {
|
|
item->setTransform(rotate, true);
|
|
}
|
|
}
|
|
|
|
void tst_QGraphicsItem::scale()
|
|
{
|
|
QGraphicsScene scene;
|
|
QGraphicsItem *item = scene.addRect(QRectF(0, 0, 100, 100));
|
|
processEvents();
|
|
|
|
const QTransform scale(QTransform::fromScale(2, 2));
|
|
QBENCHMARK {
|
|
item->setTransform(scale, true);
|
|
}
|
|
}
|
|
|
|
void tst_QGraphicsItem::shear()
|
|
{
|
|
QGraphicsScene scene;
|
|
QGraphicsItem *item = scene.addRect(QRectF(0, 0, 100, 100));
|
|
processEvents();
|
|
|
|
const QTransform shear = QTransform().shear(1.5, 1.5);
|
|
QBENCHMARK {
|
|
item->setTransform(shear, true);
|
|
}
|
|
}
|
|
|
|
void tst_QGraphicsItem::translate()
|
|
{
|
|
QGraphicsScene scene;
|
|
QGraphicsItem *item = scene.addRect(QRectF(0, 0, 100, 100));
|
|
processEvents();
|
|
|
|
const QTransform translate = QTransform::fromTranslate(100, 100);
|
|
QBENCHMARK {
|
|
item->setTransform(translate, true);
|
|
}
|
|
}
|
|
|
|
QTEST_MAIN(tst_QGraphicsItem)
|
|
#include "tst_qgraphicsitem.moc"
|