8823bb8d30
Conflicts: examples/opengl/doc/src/cube.qdoc src/corelib/global/qlibraryinfo.cpp src/corelib/text/qbytearray_p.h src/corelib/text/qlocale_data_p.h src/corelib/time/qhijricalendar_data_p.h src/corelib/time/qjalalicalendar_data_p.h src/corelib/time/qromancalendar_data_p.h src/network/ssl/qsslcertificate.h src/widgets/doc/src/graphicsview.qdoc src/widgets/widgets/qcombobox.cpp src/widgets/widgets/qcombobox.h tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro tests/manual/diaglib/debugproxystyle.cpp tests/manual/diaglib/qwidgetdump.cpp tests/manual/diaglib/qwindowdump.cpp tests/manual/diaglib/textdump.cpp util/locale_database/cldr2qlocalexml.py util/locale_database/qlocalexml.py util/locale_database/qlocalexml2cpp.py Resolution of util/locale_database/ are based on: https://codereview.qt-project.org/c/qt/qtbase/+/294250 and src/corelib/{text,time}/*_data_p.h were then regenerated by running those scripts. Updated CMakeLists.txt in each of tests/auto/corelib/serialization/qcborstreamreader/ tests/auto/corelib/serialization/qcborvalue/ tests/auto/gui/kernel/ and generated new ones in each of tests/auto/gui/kernel/qaddpostroutine/ tests/auto/gui/kernel/qhighdpiscaling/ tests/libfuzzer/corelib/text/qregularexpression/optimize/ tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/ tests/libfuzzer/gui/text/qtextdocument/sethtml/ tests/libfuzzer/gui/text/qtextdocument/setmarkdown/ tests/libfuzzer/gui/text/qtextlayout/beginlayout/ by running util/cmake/pro2cmake.py on their changed .pro files. Changed target name in tests/auto/gui/kernel/qaction/qaction.pro tests/auto/gui/kernel/qaction/qactiongroup.pro tests/auto/gui/kernel/qshortcut/qshortcut.pro to ensure unique target names for CMake Changed tst_QComboBox::currentIndex to not test the currentIndexChanged(QString), as that one does not exist in Qt 6 anymore. Change-Id: I9a85705484855ae1dc874a81f49d27a50b0dcff7
194 lines
7.5 KiB
C++
194 lines
7.5 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2020 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 "debugproxystyle.h"
|
|
#include "eventfilter.h"
|
|
|
|
#include <QDebug>
|
|
#include <QWidget>
|
|
#include <QStyleOption>
|
|
#include <QApplication>
|
|
|
|
#if QT_VERSION < 0x050000
|
|
QDebug operator<<(QDebug d, const QPixmap &p)
|
|
{
|
|
d << "QPixmap(" << p.size() << ')';
|
|
return d;
|
|
}
|
|
#endif // QT_VERSION < 0x050000
|
|
|
|
QDebug operator<<(QDebug debug, const QStyleOption *option)
|
|
{
|
|
#if QT_VERSION >= 0x050000
|
|
QDebugStateSaver saver(debug);
|
|
# if QT_VERSION >= 0x050400
|
|
debug.noquote();
|
|
# endif
|
|
debug.nospace();
|
|
#endif
|
|
if (!option) {
|
|
debug << "QStyleOption(0)";
|
|
return debug;
|
|
}
|
|
if (const QStyleOptionViewItem *ivo = qstyleoption_cast<const QStyleOptionViewItem *>(option)) {
|
|
debug << "QStyleOptionViewItem(";
|
|
#if QT_VERSION >= 0x050000
|
|
debug << ivo->index;
|
|
if (const int textSize = ivo->text.size())
|
|
debug << ", \"" << (textSize < 20 ? ivo->text : ivo->text.left(20) + QLatin1String("...")) << '"';
|
|
debug << ", ";
|
|
#else // Qt 5
|
|
Q_UNUSED(ivo)
|
|
#endif
|
|
} else {
|
|
debug << "QStyleOption(";
|
|
}
|
|
debug << "rect=" << option->rect.width() << 'x' << option->rect.height() << Qt::forcesign
|
|
<< option->rect.x() << option->rect.y() << Qt::noforcesign;
|
|
if (option->state != QStyle::State_None)
|
|
debug << ", state=" << option->state;
|
|
#if QT_VERSION >= 0x050000
|
|
if (option->styleObject && !option->styleObject->isWidgetType())
|
|
debug << ", styleObject=" << QtDiag::formatQObject(option->styleObject);
|
|
#endif
|
|
debug << ')';
|
|
return debug;
|
|
}
|
|
|
|
namespace QtDiag {
|
|
|
|
DebugProxyStyle::DebugProxyStyle(QStyle *style) : QProxyStyle(style)
|
|
{
|
|
#if QT_VERSION >= 0x050000
|
|
const qreal devicePixelRatio = qApp->devicePixelRatio();
|
|
#else
|
|
const qreal devicePixelRatio = 1;
|
|
#endif
|
|
qDebug() << __FUNCTION__ << QT_VERSION_STR
|
|
#if QT_VERSION >= 0x050000
|
|
<< QGuiApplication::platformName()
|
|
#endif
|
|
<< style->objectName() << "devicePixelRatio=" << devicePixelRatio;
|
|
}
|
|
|
|
void DebugProxyStyle::drawPrimitive(QStyle::PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const
|
|
{
|
|
qDebug() << __FUNCTION__ << "element=" << element << option << QtDiag::formatQObject(widget);
|
|
QProxyStyle::drawPrimitive( element, option, painter, widget);
|
|
}
|
|
|
|
void DebugProxyStyle::drawControl(QStyle::ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const
|
|
{
|
|
qDebug() << __FUNCTION__ << "element=" << element << option << QtDiag::formatQObject(widget);
|
|
QProxyStyle::drawControl(element, option, painter, widget);
|
|
}
|
|
|
|
void DebugProxyStyle::drawComplexControl(QStyle::ComplexControl control, const QStyleOptionComplex *option, QPainter *painter, const QWidget *widget) const
|
|
{
|
|
qDebug() << __FUNCTION__ << "control=" << control << option << QtDiag::formatQObject(widget);
|
|
QProxyStyle::drawComplexControl(control, option, painter, widget);
|
|
}
|
|
|
|
void DebugProxyStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, const QPixmap &pixmap) const
|
|
{
|
|
qDebug() << __FUNCTION__ << rect << "alignment=" << alignment << pixmap;
|
|
QProxyStyle::drawItemPixmap(painter, rect, alignment, pixmap);
|
|
}
|
|
|
|
QSize DebugProxyStyle::sizeFromContents(QStyle::ContentsType type, const QStyleOption *option, const QSize &size, const QWidget *widget) const
|
|
{
|
|
const QSize result = QProxyStyle::sizeFromContents(type, option, size, widget);
|
|
qDebug() << __FUNCTION__ << size << "type=" << type << option
|
|
<< QtDiag::formatQObject(widget) << "returns" << result;
|
|
return result;
|
|
}
|
|
|
|
QRect DebugProxyStyle::subElementRect(QStyle::SubElement element, const QStyleOption *option, const QWidget *widget) const
|
|
{
|
|
const QRect result = QProxyStyle::subElementRect(element, option, widget);
|
|
qDebug() << __FUNCTION__ << "element=" << element << option
|
|
<< QtDiag::formatQObject(widget) << "returns" << result;
|
|
return result;
|
|
}
|
|
|
|
QRect DebugProxyStyle::subControlRect(QStyle::ComplexControl cc, const QStyleOptionComplex *opt, QStyle::SubControl sc, const QWidget *widget) const
|
|
{
|
|
const QRect result = QProxyStyle::subControlRect(cc, opt, sc, widget);
|
|
qDebug() << __FUNCTION__ << "cc=" << cc << "sc=" << sc << opt
|
|
<< QtDiag::formatQObject(widget) << "returns" << result;
|
|
return result;
|
|
}
|
|
|
|
QRect DebugProxyStyle::itemTextRect(const QFontMetrics &fm, const QRect &r, int flags, bool enabled, const QString &text) const
|
|
{
|
|
const QRect result = QProxyStyle::itemTextRect(fm, r, flags, enabled, text);
|
|
qDebug() << __FUNCTION__ << r << "flags=" << flags << "enabled=" << enabled
|
|
<< text << "returns" << result;
|
|
return result;
|
|
}
|
|
|
|
QRect DebugProxyStyle::itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) const
|
|
{
|
|
const QRect result = QProxyStyle::itemPixmapRect(r, flags, pixmap);
|
|
qDebug() << __FUNCTION__ << r << "flags=" << flags << pixmap << "returns" << result;
|
|
return result;
|
|
}
|
|
|
|
int DebugProxyStyle::styleHint(StyleHint hint, const QStyleOption *option, const QWidget *widget,
|
|
QStyleHintReturn *returnData) const
|
|
{
|
|
const int result = QProxyStyle::styleHint(hint, option, widget, returnData);
|
|
qDebug() << __FUNCTION__ << hint << option << QtDiag::formatQObject(widget) << "returnData="
|
|
<< returnData << "returns" << result;
|
|
return result;
|
|
}
|
|
|
|
int DebugProxyStyle::pixelMetric(QStyle::PixelMetric metric, const QStyleOption *option, const QWidget *widget) const
|
|
{
|
|
const int result = QProxyStyle::pixelMetric(metric, option, widget);
|
|
qDebug() << __FUNCTION__ << "metric=" << metric << option
|
|
<< QtDiag::formatQObject(widget) << "returns" << result;
|
|
return result;
|
|
}
|
|
|
|
QPixmap DebugProxyStyle::standardPixmap(QStyle::StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget) const
|
|
{
|
|
const QPixmap result = QProxyStyle::standardPixmap(standardPixmap, opt, widget);
|
|
qDebug() << __FUNCTION__ << "standardPixmap=" << standardPixmap << opt << "returns" << result;
|
|
return result;
|
|
}
|
|
|
|
QPixmap DebugProxyStyle::generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const
|
|
{
|
|
const QPixmap result = QProxyStyle::generatedIconPixmap(iconMode, pixmap, opt);
|
|
qDebug() << __FUNCTION__ << "iconMode=" << iconMode << pixmap << opt << "returns" << result;
|
|
return result;
|
|
}
|
|
|
|
} // namespace QtDiag
|