From f4a8b2823e4bffb6544ee0eae7e2216881208aa4 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 30 Nov 2020 12:01:52 +0100 Subject: [PATCH] Remove irrelevant test row, fix compiler warning With the introduction of QKeyCombination, the result of |'ing together a set of modifiers and a key goes always through the same QKeySequence constructor, no matter the order. The implicit conversion through int when the wrong order is used causes a compiler warning as that conversion is deprecated. So remove that test case. Change-Id: I04e27bcd51723ee0efc77e52e45ca3eb8bac5fc7 Reviewed-by: Mitch Curtis (cherry picked from commit 9963aaacdb8b79ed079baf6425cef3d0347c2c8f) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp index 421fdc79337..23bd4db7017 100644 --- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp +++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp @@ -502,7 +502,6 @@ void tst_QKeySequence::toStringFromKeycode_data() QTest::newRow("Ctrl+Num+Del") << QKeySequence(Qt::ControlModifier | Qt::KeypadModifier | Qt::Key_Delete) << "Ctrl+Num+Del"; QTest::newRow("Ctrl+Alt+Num+Del") << QKeySequence(Qt::ControlModifier | Qt::AltModifier | Qt::KeypadModifier | Qt::Key_Delete) << "Ctrl+Alt+Num+Del"; QTest::newRow("Ctrl+Ins") << QKeySequence(Qt::ControlModifier | Qt::Key_Insert) << "Ctrl+Ins"; - QTest::newRow("Ctrl+Num+Ins(1)") << QKeySequence(Qt::Key_Insert | Qt::KeypadModifier | Qt::ControlModifier) << "Ctrl+Num+Ins"; } void tst_QKeySequence::toStringFromKeycode()