Remove Q_ASSERT from datetimeedit autotest

The assert and the last four parameters of makeList() are not needed.
The function is always used to make lists of three integers and the data
are all >= 0.

Change-Id: I93ae5a5f541cde2ff61bd9dd21164ed4a9b57403
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern

1 files changed, 2 insertions, 9 deletions

diff --git a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
index 98632ae..abbf00d 100644
--- a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
+++ b/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
@@ -2699,17 +2699,10 @@ void tst_QDateTimeEdit::task98554()
     QCOMPARE(testWidget->time(), QTime(0, 0, 10, 0));
 }
 
-static QList<int> makeList(int val1, int val2 = -1, int val3 = -1, int val4 = -1, int val5 = -1, int val6 = -1, int val7 = -1)
+static QList<int> makeList(int val1, int val2, int val3)
 {
     QList<int> ret;
-    Q_ASSERT(val1 >= 0);
-    ret << val1;
-    if (val2 < 0) {return ret;} else {ret << val2;}
-    if (val3 < 0) {return ret;} else {ret << val3;}
-    if (val4 < 0) {return ret;} else {ret << val4;}
-    if (val5 < 0) {return ret;} else {ret << val5;}
-    if (val6 < 0) {return ret;} else {ret << val6;}
-    if (val7 >= 0) {ret << val2;}
+    ret << val1 << val2 << val3;
     return ret;
 }