summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-05-05 11:17:22 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-05-05 19:26:56 +0200
commit50b9a4b357376c13ee00e060b44a1e505c632592 (patch)
treef18b8290b3e33ea5875233dae718830bc9a352e6 /tests/auto/gui
parent93038767b71559f1606c787f97d7c307fba82723 (diff)
Remove Qt6 switches from QtGui
Removing now dead code Change-Id: I021539da6517fdb8443f8ae9431fc172b7910cfc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'tests/auto/gui')
-rw-r--r--tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp6
-rw-r--r--tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp2
2 files changed, 0 insertions, 8 deletions
diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
index f970382db3..2aab336bcc 100644
--- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
+++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
@@ -1020,13 +1020,7 @@ void tst_QGuiApplication::genericPluginsAndWindowSystemEvents()
QCoreApplication::postEvent(&testReceiver, new QEvent(QEvent::User));
QCOMPARE(testReceiver.customEvents, 0);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QStaticPlugin testPluginInfo(qt_plugin_instance, qt_plugin_query_metadata);
-#else
- QStaticPlugin testPluginInfo;
- testPluginInfo.instance = qt_plugin_instance;
- testPluginInfo.rawMetaData = qt_plugin_query_metadata;
-#endif
qRegisterStaticPluginFunction(testPluginInfo);
int argc = 3;
char *argv[] = { const_cast<char*>(QTest::currentAppName()), const_cast<char*>("-plugin"), const_cast<char*>("testplugin") };
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
index 281d7e7d5c..1a644d1bdd 100644
--- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
@@ -1800,12 +1800,10 @@ void tst_QTextDocument::toHtml()
QCOMPARE(output, expectedOutput);
QDomDocument document;
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QEXPECT_FAIL("charfmt-for-list-item",
"The attribute \"style\" is redefined in the generated HTML, which is not valid "
"according to XML standard. The new QDomDocument implementation follows the XML "
"standard.", Continue);
-#endif
QVERIFY2(document.setContent(output), "Output was not valid XML");
}