diff options
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 14 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 30 |
2 files changed, 42 insertions, 2 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 5f17b234f2..4e19e5a293 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -3198,7 +3198,12 @@ int QVariant::compare(const QVariant &v) const } if (v1.d.type != v2.d.type) { // if conversion fails, default to toString - return v1.toString().compare(v2.toString(), Qt::CaseInsensitive); + int r = v1.toString().compare(v2.toString(), Qt::CaseInsensitive); + if (r == 0) { + // cmp(v) returned false, so we should try to agree with it. + return (v1.d.type < v2.d.type) ? -1 : 1; + } + return r; } } if (v1.d.type >= QMetaType::User) { @@ -3220,7 +3225,12 @@ int QVariant::compare(const QVariant &v) const case QVariant::DateTime: return v1.toDateTime() < v2.toDateTime() ? -1 : 1; } - return v1.toString().compare(v2.toString(), Qt::CaseInsensitive); + int r = v1.toString().compare(v2.toString(), Qt::CaseInsensitive); + if (r == 0) { + // cmp(v) returned false, so we should try to agree with it. + return (d.type < v.d.type) ? -1 : 1; + } + return r; } /*! diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index c7d862c20e..7bdc91cfbb 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -250,6 +250,10 @@ private slots: void pairElements(); void enums(); + + void compareSanity_data(); + void compareSanity(); + private: void dataStream_data(QDataStream::Version version); void loadQVariantFromDataStream(QDataStream::Version version); @@ -4153,5 +4157,31 @@ void tst_QVariant::enums() #endif } +void tst_QVariant::compareSanity_data() +{ + QTest::addColumn<QVariant>("value1"); + QTest::addColumn<QVariant>("value2"); + + QTest::newRow( "int <>/== QUrl" ) << QVariant( 97 ) << QVariant(QUrl("a")); + QTest::newRow( "int <>/== QChar" ) << QVariant( 97 ) << QVariant(QChar('a')); + QTest::newRow( "int <>/== QString" ) << QVariant( 97 ) << QVariant(QString("a")); + QTest::newRow( "QUrl <>/== QChar" ) << QVariant(QUrl("a")) << QVariant(QChar('a')); + QTest::newRow( "QUrl <>/== QString" ) << QVariant(QUrl("a")) << QVariant(QString("a")); + QTest::newRow( "QChar <>/== QString" ) << QVariant(QChar('a')) << QVariant(QString("a")); +} + +void tst_QVariant::compareSanity() +{ + QFETCH(QVariant, value1); + QFETCH(QVariant, value2); + + if (value1 == value2) { + QVERIFY(!(value1 < value2) && !(value1 > value2)); + } else { + QVERIFY(value1 != value2); + QVERIFY((value1 < value2) || (value1 > value2)); + } +} + QTEST_MAIN(tst_QVariant) #include "tst_qvariant.moc" |