diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-09-11 13:50:30 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-09-28 17:23:20 +0200 |
| commit | 09025084110702a17b1edd7e2e80cd9e063e64fd (patch) | |
| tree | 980bed89411f5dd79bf5db5d6dea4803261ea8d1 /tests/auto/gui/kernel/qguivariant/test | |
| parent | 673da7d4607cd5597b3c58f8c118459efdcaaeb3 (diff) | |
Fix compiler warnings from QKeyCombination
Change lots of code to avoid the deprecated operator+() or implicit
casts to int.
Change-Id: I0c343cd5b28603afdf1214eefb85e928313345e2
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/gui/kernel/qguivariant/test')
| -rw-r--r-- | tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp index 382f17d519..28ca3b8e7b 100644 --- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp +++ b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp @@ -353,12 +353,12 @@ void tst_QGuiVariant::toKeySequence_data() QTest::addColumn<QKeySequence>("result"); - QTest::newRow( "int" ) << QVariant( 67108929 ) << QKeySequence( Qt::CTRL + Qt::Key_A ); + QTest::newRow( "int" ) << QVariant( 67108929 ) << QKeySequence( Qt::CTRL | Qt::Key_A ); QTest::newRow( "qstring" ) << QVariant( QString( "Ctrl+A" ) ) - << QKeySequence( Qt::CTRL + Qt::Key_A ); + << QKeySequence( Qt::CTRL | Qt::Key_A ); } void tst_QGuiVariant::toKeySequence() @@ -376,7 +376,7 @@ void tst_QGuiVariant::toString_data() QTest::addColumn<QVariant>("value"); QTest::addColumn<QString>("result"); - QTest::newRow( "qkeysequence" ) << QVariant::fromValue( QKeySequence( Qt::CTRL + Qt::Key_A ) ) + QTest::newRow( "qkeysequence" ) << QVariant::fromValue( QKeySequence( Qt::CTRL | Qt::Key_A ) ) #ifndef Q_OS_MAC << QString( "Ctrl+A" ); #else @@ -499,7 +499,7 @@ void tst_QGuiVariant::writeToReadFromDataStream_data() pixmap.fill( Qt::red ); QTest::newRow( "pixmap_valid" ) << QVariant::fromValue( pixmap ) << false; QTest::newRow( "image_invalid" ) << QVariant::fromValue( QImage() ) << false; - QTest::newRow( "keysequence_valid" ) << QVariant::fromValue( QKeySequence( Qt::CTRL + Qt::Key_A ) ) << false; + QTest::newRow( "keysequence_valid" ) << QVariant::fromValue( QKeySequence( Qt::CTRL | Qt::Key_A ) ) << false; QTest::newRow( "palette_valid" ) << QVariant::fromValue(QPalette(QColor("turquoise"))) << false; QTest::newRow( "pen_valid" ) << QVariant::fromValue( QPen( Qt::red ) ) << false; QTest::newRow( "pointarray_invalid" ) << QVariant::fromValue( QPolygon() ) << false; |