summaryrefslogtreecommitdiff
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/.prev_CMakeLists.txt6
-rw-r--r--tests/auto/CMakeLists.txt6
-rw-r--r--tests/auto/qx11info/.prev_CMakeLists.txt15
-rw-r--r--tests/auto/qx11info/CMakeLists.txt15
-rw-r--r--tests/auto/qx11info/tst_qx11info.cpp2
5 files changed, 43 insertions, 1 deletions
diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt
new file mode 100644
index 0000000..b694a81
--- /dev/null
+++ b/tests/auto/.prev_CMakeLists.txt
@@ -0,0 +1,6 @@
+# Generated from auto.pro.
+
+add_subdirectory(cmake)
+if(TARGET Qt::Widgets)
+ add_subdirectory(qx11info)
+endif()
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
new file mode 100644
index 0000000..e581e78
--- /dev/null
+++ b/tests/auto/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Generated from auto.pro.
+
+# add_subdirectory(cmake) # special case remove
+if(TARGET Qt::Widgets)
+ add_subdirectory(qx11info)
+endif()
diff --git a/tests/auto/qx11info/.prev_CMakeLists.txt b/tests/auto/qx11info/.prev_CMakeLists.txt
new file mode 100644
index 0000000..0e60be4
--- /dev/null
+++ b/tests/auto/qx11info/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qx11info.pro.
+
+#####################################################################
+## tst_qx11info Test:
+#####################################################################
+
+qt_internal_add_test(tst_qx11info
+ SOURCES
+ tst_qx11info.cpp
+ PUBLIC_LIBRARIES
+ Qt::Gui
+ Qt::Widgets
+ Qt::X11Extras
+ XCB::XCB
+)
diff --git a/tests/auto/qx11info/CMakeLists.txt b/tests/auto/qx11info/CMakeLists.txt
new file mode 100644
index 0000000..0e60be4
--- /dev/null
+++ b/tests/auto/qx11info/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qx11info.pro.
+
+#####################################################################
+## tst_qx11info Test:
+#####################################################################
+
+qt_internal_add_test(tst_qx11info
+ SOURCES
+ tst_qx11info.cpp
+ PUBLIC_LIBRARIES
+ Qt::Gui
+ Qt::Widgets
+ Qt::X11Extras
+ XCB::XCB
+)
diff --git a/tests/auto/qx11info/tst_qx11info.cpp b/tests/auto/qx11info/tst_qx11info.cpp
index e997832..b4207c1 100644
--- a/tests/auto/qx11info/tst_qx11info.cpp
+++ b/tests/auto/qx11info/tst_qx11info.cpp
@@ -244,7 +244,7 @@ protected:
return false;
}
- void exposeEvent(QExposeEvent *)
+ void exposeEvent(QExposeEvent *) override
{
if (m_ignoreSubsequentExpose)
return;