diff options
Diffstat (limited to 'tests/auto/gui/kernel/qguivariant')
4 files changed, 80 insertions, 3 deletions
diff --git a/tests/auto/gui/kernel/qguivariant/CMakeLists.txt b/tests/auto/gui/kernel/qguivariant/CMakeLists.txt index 41b0aacf85..3a0adab6e3 100644 --- a/tests/auto/gui/kernel/qguivariant/CMakeLists.txt +++ b/tests/auto/gui/kernel/qguivariant/CMakeLists.txt @@ -1,2 +1,4 @@ -# add_subdirectory("test") -add_subdirectory("no_application") +# Generated from qguivariant.pro. + +add_subdirectory(test) +add_subdirectory(no_application) diff --git a/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt b/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt index b8acedbe45..8261212801 100644 --- a/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt +++ b/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt @@ -1 +1,12 @@ -add_qt_test(no_application SOURCES main.cpp LIBRARIES Qt::Gui) +# Generated from no_application.pro. + +##################################################################### +## no_application Test: +##################################################################### + +add_qt_test(no_application + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt b/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt new file mode 100644 index 0000000000..af2cea60e6 --- /dev/null +++ b/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt @@ -0,0 +1,38 @@ +# Generated from test.pro. + +##################################################################### +## tst_qguivariant Test: +##################################################################### + +add_qt_test(tst_qguivariant + SOURCES + tst_qguivariant.cpp + INCLUDE_DIRECTORIES + ../../../../other/qvariant_common + PUBLIC_LIBRARIES + Qt::Gui +) + +# Resources: +set(tst_qguivariant_resource_files + "black.png" + "black2.png" +) + +add_qt_resource(tst_qguivariant "tst_qguivariant" + PREFIX + "/" + FILES + ${tst_qguivariant_resource_files} +) +set(qguivariant_resource_files + "data" +) + +add_qt_resource(tst_qguivariant "qguivariant" + PREFIX + "/" + FILES + ${qguivariant_resource_files} +) + diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp index a057ec2207..8b301c145a 100644 --- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp +++ b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp @@ -113,6 +113,7 @@ private slots: void guiVariantAtExit(); void iconEquality(); + void qt4QPolygonFDataStream(); }; void tst_QGuiVariant::constructor_invalid_data() @@ -401,6 +402,9 @@ void tst_QGuiVariant::toString() QCOMPARE( str, result ); } +#if QT_DEPRECATED_SINCE(5, 15) +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED void tst_QGuiVariant::matrix() { QVariant variant; @@ -413,6 +417,8 @@ void tst_QGuiVariant::matrix() QVERIFY(mmatrix); QMetaType::destroy(QVariant::Matrix, mmatrix); } +QT_WARNING_POP +#endif void tst_QGuiVariant::matrix4x4() { @@ -783,5 +789,25 @@ void tst_QGuiVariant::iconEquality() QVERIFY(a != b); } +void tst_QGuiVariant::qt4QPolygonFDataStream() +{ + qRegisterMetaTypeStreamOperators<QPolygonF>(); + + QByteArray data; + QDataStream stream(&data, QIODevice::WriteOnly); + stream.setVersion(QDataStream::Qt_4_8); + QPolygonF polygon; + polygon.append(QPointF(2, 3)); + stream << QVariant::fromValue(polygon); + const QByteArray qt4Data = QByteArray::fromHex("0000007f000000000a51506f6c79676f6e46000000000140000000000000004008000000000000"); + QCOMPARE(data, qt4Data); + + QDataStream input(&data, QIODevice::ReadOnly); + input.setVersion(QDataStream::Qt_4_8); + QVariant result; + input >> result; + QCOMPARE(result.value<QPolygonF>(), polygon); +} + QTEST_MAIN(tst_QGuiVariant) #include "tst_qguivariant.moc" |