amass/qt6windows7
1
0
Fork 0
mirror of https://github.com/crystalidea/qt6windows7.git synced 2025-07-05 00:35:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

6.5.3 clean

Browse Source
This commit is contained in:
kleuter
2023-11-01 18:02:52 +01:00
parent bbe896803b
commit 7018d9e6c8
2170 changed files with 57471 additions and 43550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/widgets/itemviews/qabstractitemview/BLACKLIST
View File

@ -0,0 +1,2 @@
[selectionAutoScrolling]
wayland

5
tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
View File

@ -2564,8 +2564,9 @@ void tst_QListView::taskQTBUG_58749_adjustToContent()
// use the long text and make sure the width is adjusted.
model.setData(model.index(0, 0), longText);
QApplication::processEvents();
QVERIFY(w.width() > longTextWidth);
QVERIFY(view->width() >= longTextWidth);
const QRect itemRect = view->visualRect(model.index(0, 0));
QVERIFY(w.width() > itemRect.width());
QCOMPARE_GE(view->width(), itemRect.width());
}
void tst_QListView::taskQTBUG_51086_skippingIndexesInSelectedIndexes()

21
tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
View File

@ -52,6 +52,13 @@ public:
: QAbstractTableModel(parent), row_count(rows), column_count(columns)
{}
void insertRows(int rows)
{
beginInsertRows(QModelIndex(), row_count, row_count + rows - 1);
row_count += rows;
endInsertRows();
}
int rowCount(const QModelIndex& = QModelIndex()) const override
{
return row_count;
@ -429,6 +436,7 @@ private slots:
void viewOptions();
void taskQTBUG_7232_AllowUserToControlSingleStep();
void rowsInVerticalHeader();
#if QT_CONFIG(textmarkdownwriter)
void markdownWriter();
@ -4929,5 +4937,18 @@ void tst_QTableView::markdownWriter()
}
#endif
void tst_QTableView::rowsInVerticalHeader()
{
QtTestTableModel model(0, 2);
QTableView view;
view.setModel(&model);
view.show();
QVERIFY(QTest::qWaitForWindowExposed(&view));
auto *verticalHeader = view.verticalHeader();
QCOMPARE(verticalHeader->count(), 0);
model.insertRows(2);
QCOMPARE(verticalHeader->count(), 2);
}
QTEST_MAIN(tst_QTableView)
#include "tst_qtableview.moc"

10
tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
View File

@ -4,6 +4,7 @@
#include <QHeaderView>
#include <QLineEdit>
#include <QMimeData>
#include <QScrollBar>
#include <QSignalSpy>
#include <QTableWidget>
#include <QTest>
@ -1556,6 +1557,12 @@ void tst_QTableWidget::sizeHint()
QFETCH(Qt::ScrollBarPolicy, scrollBarPolicy);
QFETCH(QSize, viewSize);
const QString defaultStyle = QApplication::style()->name();
QApplication::setStyle("windows");
const auto resetStyle = qScopeGuard([defaultStyle]{
QApplication::setStyle(defaultStyle);
});
QTableWidget view(2, 2);
view.setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
view.setVerticalScrollBarPolicy(scrollBarPolicy);
@ -1575,18 +1582,21 @@ void tst_QTableWidget::sizeHint()
QTRY_COMPARE(view.size(), viewSize);
}
QApplication::processEvents(); // execute delayed layouts
auto sizeHint = view.sizeHint();
view.hide();
QCOMPARE(view.sizeHint(), sizeHint);
view.horizontalHeader()->hide();
view.show();
QApplication::processEvents(); // execute delayed layouts
sizeHint = view.sizeHint();
view.hide();
QCOMPARE(view.sizeHint(), sizeHint);
view.verticalHeader()->hide();
view.show();
QApplication::processEvents(); // execute delayed layouts
sizeHint = view.sizeHint();
view.hide();
QCOMPARE(view.sizeHint(), sizeHint);

7
tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
View File

@ -2627,6 +2627,12 @@ void tst_QTreeWidget::sizeHint()
QFETCH(Qt::ScrollBarPolicy, scrollBarPolicy);
QFETCH(QSize, viewSize);
const QString defaultStyle = QApplication::style()->name();
QApplication::setStyle("fusion");
const auto resetStyle = qScopeGuard([defaultStyle]{
QApplication::setStyle(defaultStyle);
});
QTreeWidget view;
view.setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
view.setVerticalScrollBarPolicy(scrollBarPolicy);
@ -2644,6 +2650,7 @@ void tst_QTreeWidget::sizeHint()
QTRY_COMPARE(view.size(), viewSize);
}
QApplication::processEvents(); // execute delayed layouts
auto sizeHint = view.sizeHint();
view.hide();
QCOMPARE(view.sizeHint(), sizeHint);