summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/util
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/widgets/util')
-rw-r--r--tests/auto/widgets/util/qcompleter/CMakeLists.txt18
-rw-r--r--tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp34
-rw-r--r--tests/auto/widgets/util/qscroller/BLACKLIST5
-rw-r--r--tests/auto/widgets/util/qscroller/CMakeLists.txt15
-rw-r--r--tests/auto/widgets/util/qsystemtrayicon/CMakeLists.txt14
-rw-r--r--tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp3
-rw-r--r--tests/auto/widgets/util/qundogroup/CMakeLists.txt14
-rw-r--r--tests/auto/widgets/util/qundostack/CMakeLists.txt14
8 files changed, 110 insertions, 7 deletions
diff --git a/tests/auto/widgets/util/qcompleter/CMakeLists.txt b/tests/auto/widgets/util/qcompleter/CMakeLists.txt
index 15b01f0346..fb87c3beec 100644
--- a/tests/auto/widgets/util/qcompleter/CMakeLists.txt
+++ b/tests/auto/widgets/util/qcompleter/CMakeLists.txt
@@ -1 +1,17 @@
-add_qt_test("tst_qcompleter" SOURCES tst_qcompleter.cpp LIBRARIES Qt::Widgets Qt::TestPrivate)
+# Generated from qcompleter.pro.
+
+#####################################################################
+## tst_qcompleter Test:
+#####################################################################
+
+add_qt_test(tst_qcompleter
+ SOURCES
+ tst_qcompleter.cpp
+ PUBLIC_LIBRARIES
+ Qt::Gui
+ Qt::TestPrivate
+ Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qcompleter.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
index ec383e42fd..fe3e3c7f72 100644
--- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
+++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
@@ -1103,6 +1103,9 @@ void tst_QCompleter::modelDeletion()
void tst_QCompleter::multipleWidgets()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QStringList list;
list << "item1" << "item2" << "item2";
QCompleter completer(list);
@@ -1149,6 +1152,9 @@ void tst_QCompleter::multipleWidgets()
void tst_QCompleter::focusIn()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QCompleter completer({"item1", "item2", "item2"});
QWidget window;
@@ -1236,6 +1242,9 @@ void tst_QCompleter::disabledItems()
void tst_QCompleter::task178797_activatedOnReturn()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QLineEdit ledit;
setFrameless(&ledit);
auto completer = new QCompleter({"foobar1", "foobar2"}, &ledit);
@@ -1317,6 +1326,9 @@ private slots:
void tst_QCompleter::task246056_setCompletionPrefix()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
task246056_ComboBox comboBox;
setFrameless(&comboBox);
QVERIFY(comboBox.completer());
@@ -1385,6 +1397,9 @@ private:
void tst_QCompleter::task250064_lostFocus()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
task250064_Widget widget;
widget.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
widget.show();
@@ -1414,6 +1429,9 @@ void tst_QCompleter::task253125_lineEditCompletion_data()
void tst_QCompleter::task253125_lineEditCompletion()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QFETCH(QStringList, list);
QFETCH(QCompleter::CompletionMode, completionMode);
@@ -1572,6 +1590,9 @@ void tst_QCompleter::task253125_lineEditCompletion()
void tst_QCompleter::task247560_keyboardNavigation()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QStandardItemModel model;
for (int i = 0; i < 5; i++) {
@@ -1682,6 +1703,9 @@ static inline bool testFileSystemReady(const QAbstractItemModel &model)
void tst_QCompleter::QTBUG_14292_filesystem()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
// This test tests whether the creation of subdirectories
// does not cause completers based on file system models
// to pop up the completion list due to file changed signals.
@@ -1756,6 +1780,9 @@ void tst_QCompleter::QTBUG_14292_filesystem()
void tst_QCompleter::QTBUG_52028_tabAutoCompletes()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QWidget w;
w.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
w.setLayout(new QVBoxLayout);
@@ -1780,7 +1807,7 @@ void tst_QCompleter::QTBUG_52028_tabAutoCompletes()
QApplication::setActiveWindow(&w);
QVERIFY(QTest::qWaitForWindowActive(&w));
- QSignalSpy activatedSpy(&cbox, QOverload<int>::of(&QComboBox::activated));
+ QSignalSpy activatedSpy(&cbox, &QComboBox::activated);
// Tab key will complete but not activate
cbox.lineEdit()->clear();
@@ -1798,6 +1825,9 @@ void tst_QCompleter::QTBUG_52028_tabAutoCompletes()
void tst_QCompleter::QTBUG_51889_activatedSentTwice()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
QWidget w;
w.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
w.setLayout(new QVBoxLayout);
@@ -1821,7 +1851,7 @@ void tst_QCompleter::QTBUG_51889_activatedSentTwice()
QApplication::setActiveWindow(&w);
QVERIFY(QTest::qWaitForWindowActive(&w));
- QSignalSpy activatedSpy(&cbox, QOverload<int>::of(&QComboBox::activated));
+ QSignalSpy activatedSpy(&cbox, &QComboBox::activated);
// Navigate + enter activates only once (first item)
cbox.lineEdit()->clear();
diff --git a/tests/auto/widgets/util/qscroller/BLACKLIST b/tests/auto/widgets/util/qscroller/BLACKLIST
new file mode 100644
index 0000000000..347ab6440b
--- /dev/null
+++ b/tests/auto/widgets/util/qscroller/BLACKLIST
@@ -0,0 +1,5 @@
+[scrollTo]
+macos
+
+[scroll]
+macos
diff --git a/tests/auto/widgets/util/qscroller/CMakeLists.txt b/tests/auto/widgets/util/qscroller/CMakeLists.txt
index 006399652c..b6c6efcc2f 100644
--- a/tests/auto/widgets/util/qscroller/CMakeLists.txt
+++ b/tests/auto/widgets/util/qscroller/CMakeLists.txt
@@ -1 +1,14 @@
-add_qt_test("tst_qscroller" SOURCES tst_qscroller.cpp LIBRARIES Qt::Widgets Qt::GuiPrivate)
+# Generated from qscroller.pro.
+
+#####################################################################
+## tst_qscroller Test:
+#####################################################################
+
+add_qt_test(tst_qscroller
+ SOURCES
+ tst_qscroller.cpp
+ PUBLIC_LIBRARIES
+ Qt::Gui
+ Qt::GuiPrivate
+ Qt::Widgets
+)
diff --git a/tests/auto/widgets/util/qsystemtrayicon/CMakeLists.txt b/tests/auto/widgets/util/qsystemtrayicon/CMakeLists.txt
index 2b609725a1..df6efa7281 100644
--- a/tests/auto/widgets/util/qsystemtrayicon/CMakeLists.txt
+++ b/tests/auto/widgets/util/qsystemtrayicon/CMakeLists.txt
@@ -1 +1,13 @@
-add_qt_test("tst_qsystemtrayicon" SOURCES tst_qsystemtrayicon.cpp LIBRARIES Qt::Widgets)
+# Generated from qsystemtrayicon.pro.
+
+#####################################################################
+## tst_qsystemtrayicon Test:
+#####################################################################
+
+add_qt_test(tst_qsystemtrayicon
+ SOURCES
+ tst_qsystemtrayicon.cpp
+ PUBLIC_LIBRARIES
+ Qt::Gui
+ Qt::Widgets
+)
diff --git a/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp b/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp
index 5acaf49e6c..148894dc4e 100644
--- a/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp
+++ b/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp
@@ -106,6 +106,9 @@ void tst_QSystemTrayIcon::getSetCheck()
void tst_QSystemTrayIcon::supportsMessages()
{
+ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+ QSKIP("Wayland: This fails. Figure out why.");
+
// ### fixme: Check platforms.
const QString platform = QGuiApplication::platformName();
if (platform.compare(QStringLiteral("xcb"), Qt::CaseInsensitive)
diff --git a/tests/auto/widgets/util/qundogroup/CMakeLists.txt b/tests/auto/widgets/util/qundogroup/CMakeLists.txt
index 9c67f61c51..600a7d7da1 100644
--- a/tests/auto/widgets/util/qundogroup/CMakeLists.txt
+++ b/tests/auto/widgets/util/qundogroup/CMakeLists.txt
@@ -1 +1,13 @@
-add_qt_test("tst_qundogroup" SOURCES tst_qundogroup.cpp LIBRARIES Qt::Widgets)
+# Generated from qundogroup.pro.
+
+#####################################################################
+## tst_qundogroup Test:
+#####################################################################
+
+add_qt_test(tst_qundogroup
+ SOURCES
+ tst_qundogroup.cpp
+ PUBLIC_LIBRARIES
+ Qt::Gui
+ Qt::Widgets
+)
diff --git a/tests/auto/widgets/util/qundostack/CMakeLists.txt b/tests/auto/widgets/util/qundostack/CMakeLists.txt
index 690bcdacfd..5fc049991f 100644
--- a/tests/auto/widgets/util/qundostack/CMakeLists.txt
+++ b/tests/auto/widgets/util/qundostack/CMakeLists.txt
@@ -1 +1,13 @@
-add_qt_test("tst_qundostack" SOURCES tst_qundostack.cpp LIBRARIES Qt::Widgets)
+# Generated from qundostack.pro.
+
+#####################################################################
+## tst_qundostack Test:
+#####################################################################
+
+add_qt_test(tst_qundostack
+ SOURCES
+ tst_qundostack.cpp
+ PUBLIC_LIBRARIES
+ Qt::Gui
+ Qt::Widgets
+)