summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/widgets')
-rw-r--r--tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp2
-rw-r--r--tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp1
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp42
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp4
-rw-r--r--tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp2
-rw-r--r--tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp2
-rw-r--r--tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp6
-rw-r--r--tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp1
-rw-r--r--tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp1
-rw-r--r--tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp3
10 files changed, 21 insertions, 43 deletions
diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index 483841e8f5..bdc760926b 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -517,11 +517,9 @@ void tst_QFiledialog::completer()
if (!fullPath.endsWith(QLatin1Char('/')))
fullPath.append(QLatin1Char('/'));
fullPath.append(input);
- bool inputStartsWithRootPath = false;
if (input.startsWith(QDir::rootPath())) {
fullPath = input;
input.clear();
- inputStartsWithRootPath = true;
}
QFileInfo fi(fullPath);
diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
index 3bf618b679..f195017dc4 100644
--- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
+++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
@@ -522,6 +522,7 @@ void tst_QMessageBox::testSymbols()
button = QMessageBox::Default;
button = QMessageBox::Escape;
button = QMessageBox::FlagMask;
+ QVERIFY(button);
const QString text = QStringLiteral("Foo");
mb1.setText(text);
diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
index f943daf411..3f782d0808 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
@@ -578,7 +578,6 @@ void tst_QGraphicsProxyWidget::eventFilter()
break;
}
case QEvent::Resize: {
- QSize oldSize = widget->size();
QSize newSize = QSize(100, 100);
if (fromObject) {
widget->resize(newSize);
@@ -590,7 +589,6 @@ void tst_QGraphicsProxyWidget::eventFilter()
break;
}
case QEvent::Move: {
- QPoint oldPoint = widget->pos();
QPoint newPoint = QPoint(100, 100);
if (fromObject) {
widget->move(newPoint);
@@ -2651,26 +2649,25 @@ void tst_QGraphicsProxyWidget::childPos_data()
QTest::addColumn<bool>("moveCombo");
QTest::addColumn<QPoint>("comboPos");
QTest::addColumn<QPointF>("proxyPos");
- QTest::addColumn<QPointF>("menuPos");
-
- QTest::newRow("0") << true << QPoint() << QPointF() << QPointF();
- QTest::newRow("1") << true << QPoint(10, 0) << QPointF(10, 0) << QPointF();
- QTest::newRow("2") << true << QPoint(100, 0) << QPointF(100, 0) << QPointF();
- QTest::newRow("3") << true << QPoint(1000, 0) << QPointF(1000, 0) << QPointF();
- QTest::newRow("4") << true << QPoint(10000, 0) << QPointF(10000, 0) << QPointF();
- QTest::newRow("5") << true << QPoint(-10000, 0) << QPointF(-10000, 0) << QPointF();
- QTest::newRow("6") << true << QPoint(-1000, 0) << QPointF(-1000, 0) << QPointF();
- QTest::newRow("7") << true << QPoint(-100, 0) << QPointF(-100, 0) << QPointF();
- QTest::newRow("8") << true << QPoint(-10, 0) << QPointF(-10, 0) << QPointF();
- QTest::newRow("0-") << false << QPoint() << QPointF() << QPointF();
- QTest::newRow("1-") << false << QPoint(10, 0) << QPointF(10, 0) << QPointF();
- QTest::newRow("2-") << false << QPoint(100, 0) << QPointF(100, 0) << QPointF();
- QTest::newRow("3-") << false << QPoint(1000, 0) << QPointF(1000, 0) << QPointF();
- QTest::newRow("4-") << false << QPoint(10000, 0) << QPointF(10000, 0) << QPointF();
- QTest::newRow("5-") << false << QPoint(-10000, 0) << QPointF(-10000, 0) << QPointF();
- QTest::newRow("6-") << false << QPoint(-1000, 0) << QPointF(-1000, 0) << QPointF();
- QTest::newRow("7-") << false << QPoint(-100, 0) << QPointF(-100, 0) << QPointF();
- QTest::newRow("8-") << false << QPoint(-10, 0) << QPointF(-10, 0) << QPointF();
+
+ QTest::newRow("0") << true << QPoint() << QPointF();
+ QTest::newRow("1") << true << QPoint(10, 0) << QPointF(10, 0);
+ QTest::newRow("2") << true << QPoint(100, 0) << QPointF(100, 0);
+ QTest::newRow("3") << true << QPoint(1000, 0) << QPointF(1000, 0);
+ QTest::newRow("4") << true << QPoint(10000, 0) << QPointF(10000, 0);
+ QTest::newRow("5") << true << QPoint(-10000, 0) << QPointF(-10000, 0);
+ QTest::newRow("6") << true << QPoint(-1000, 0) << QPointF(-1000, 0);
+ QTest::newRow("7") << true << QPoint(-100, 0) << QPointF(-100, 0);
+ QTest::newRow("8") << true << QPoint(-10, 0) << QPointF(-10, 0);
+ QTest::newRow("0-") << false << QPoint() << QPointF();
+ QTest::newRow("1-") << false << QPoint(10, 0) << QPointF(10, 0);
+ QTest::newRow("2-") << false << QPoint(100, 0) << QPointF(100, 0);
+ QTest::newRow("3-") << false << QPoint(1000, 0) << QPointF(1000, 0);
+ QTest::newRow("4-") << false << QPoint(10000, 0) << QPointF(10000, 0);
+ QTest::newRow("5-") << false << QPoint(-10000, 0) << QPointF(-10000, 0);
+ QTest::newRow("6-") << false << QPoint(-1000, 0) << QPointF(-1000, 0);
+ QTest::newRow("7-") << false << QPoint(-100, 0) << QPointF(-100, 0);
+ QTest::newRow("8-") << false << QPoint(-10, 0) << QPointF(-10, 0);
}
void tst_QGraphicsProxyWidget::childPos()
@@ -2681,7 +2678,6 @@ void tst_QGraphicsProxyWidget::childPos()
QFETCH(bool, moveCombo);
QFETCH(QPoint, comboPos);
QFETCH(QPointF, proxyPos);
- QFETCH(QPointF, menuPos);
QGraphicsScene scene;
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index ad204f231d..a5dc0c69f0 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -1369,7 +1369,6 @@ void tst_QGraphicsView::itemsInRect()
view.setSceneRect(-10000, -10000, 20000, 20000);
view.show();
- QPoint centerPoint = view.viewport()->rect().center();
QRect leftRect = view.mapFromScene(-30, -10, 20, 20).boundingRect();
QRect rightRect = view.mapFromScene(30, -10, 20, 20).boundingRect();
@@ -1490,7 +1489,6 @@ void tst_QGraphicsView::itemsInPoly()
view.setSceneRect(-10000, -10000, 20000, 20000);
view.show();
- QPoint centerPoint = view.viewport()->rect().center();
QPolygon leftPoly = view.mapFromScene(QRectF(-30, -10, 20, 20));
QPolygon rightPoly = view.mapFromScene(QRectF(30, -10, 20, 20));
@@ -1534,7 +1532,6 @@ void tst_QGraphicsView::itemsInPath()
view.setSceneRect(-10000, -10000, 20000, 20000);
view.show();
- QPoint centerPoint = view.viewport()->rect().center();
QPainterPath leftPath;
leftPath.addEllipse(QRect(view.mapFromScene(-30, -10), QSize(20, 20)));
@@ -1794,7 +1791,6 @@ void tst_QGraphicsView::mapToScenePath()
view.translate(10, 10);
view.setFixedSize(300, 300);
view.show();
- QPoint center = view.viewport()->rect().center();
QRect rect(QPoint(10, 0), QSize(10, 10));
QPainterPath path;
diff --git a/tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp b/tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp
index 2542496f14..32c26b5078 100644
--- a/tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp
+++ b/tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp
@@ -169,7 +169,7 @@ void tst_QStringListModel::rowsAboutToBeRemoved_rowsRemoved_data()
QStringList strings3; strings3 << "One" << "Two" << "Three" << "Four" << "Five";
QStringList aboutto3; aboutto3 << "One" << "Two" << "Three" << "Four" << "Five";
- QStringList res3; res3 ;
+ QStringList res3;
QTest::newRow( "data3" ) << strings3 << 0 << 5 << aboutto3 << res3;
/* Not sure if this is a valid test */
diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
index 71a82cf2bb..ca358d39c4 100644
--- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
@@ -3280,8 +3280,6 @@ void tst_QTreeWidget::taskQTBUG2844_visualItemRect()
tree.setColumnCount(3);
QTreeWidgetItem item(&tree);
- QRect itemRect = tree.visualItemRect(&item);
-
QRect rectCol0 = tree.visualRect(tree.indexFromItem(&item, 0));
QRect rectCol1 = tree.visualRect(tree.indexFromItem(&item, 1));
QRect rectCol2 = tree.visualRect(tree.indexFromItem(&item, 2));
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index 67df4df257..fe02d1a681 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -5015,8 +5015,6 @@ void tst_QWidget::moveChild()
parent.setGeometry(60, 60, 150, 150);
#endif
child.setGeometry(25, 25, 50, 50);
- QPoint childOffset = child.mapToGlobal(QPoint());
-
parent.show();
QTest::qWaitForWindowShown(&parent);
QTest::qWait(30);
@@ -6970,9 +6968,6 @@ void tst_QWidget::render_worldTransform()
painter.translate(105, 5);
painter.rotate(90);
- const QTransform worldTransform = painter.worldTransform();
- const QTransform deviceTransform = painter.deviceTransform();
-
// Render widgets onto image.
widget.render(&painter);
#ifdef RENDER_DEBUG
@@ -7100,7 +7095,6 @@ void tst_QWidget::repaintWhenChildDeleted()
w.r = QRegion();
{
- const QPoint tlwOffset = w.geometry().topLeft();
ColorWidget child(&w, Qt::blue);
child.setGeometry(10, 10, 10, 10);
child.show();
diff --git a/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp
index 50dc6a1d1c..e4c1df2c6b 100644
--- a/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp
+++ b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp
@@ -180,7 +180,6 @@ void tst_QCalendarWidget::buttonClickCheck()
object.setGeometry(0,0,size.width(), size.height());
object.show();
- QRect rect = object.geometry();
QDate selectedDate(2005, 1, 1);
//click on the month buttons
int month = object.monthShown();
diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
index 952078c0ff..1fbd0f0da7 100644
--- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
@@ -294,7 +294,6 @@ void tst_QMainWindow::iconSize()
// the default is determined by the style
const int metric = mw.style()->pixelMetric(QStyle::PM_ToolBarIconSize);
- const QSize defaultIconSize = QSize(metric, metric);
const QSize smallIconSize = QSize(metric / 2, metric / 2);
const QSize largeIconSize = QSize(metric * 2, metric * 2);
diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
index ab128a2ce2..0a76c9a945 100644
--- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
@@ -2026,9 +2026,6 @@ void tst_QTextEdit::fullWidthSelection2()
widget.setExtraSelections(selections);
compareWidgetAndImage(widget, "fullWidthSelection/nowrap_long.png");
-
- QTextLine line = widget.document()->begin().layout()->lineAt(0);
- // qDebug() << line.width();
}
void tst_QTextEdit::compareWidgetAndImage(QTextEdit &widget, const QString &imageFileName)