summaryrefslogtreecommitdiffstats
path: root/src/testlib/doc/snippets
diff options
context:
space:
mode:
authorAhmad Samir <a.samirh78@gmail.com>2023-03-05 01:48:18 +0200
committerAhmad Samir <a.samirh78@gmail.com>2023-06-30 02:24:54 +0300
commitfa296ee1dcf4c16fb6f242cf08949485e499fec3 (patch)
tree3aeb450f18fe453b2c4a08a0f1110bb27753c083 /src/testlib/doc/snippets
parent57712e1160dd2bd37e8a0838cf0298b740a96983 (diff)
QTest: add QDeadlineTimer qWaitFor() overload
For Forever timers, don't check the remaining time. Merge src_corelib_kernel_qtestsupport_core_snippet.cpp and src_corelib_kernel_qtestsupport_core.cpp. [ChangeLog][QtCore][QTest] Added QDeadlineTimer qWaitFor() overload. Change-Id: I74c3f362b77206426136a418e656465e43f45b09 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/testlib/doc/snippets')
-rw-r--r--src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core.cpp13
-rw-r--r--src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core_snippet.cpp10
2 files changed, 13 insertions, 10 deletions
diff --git a/src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core.cpp b/src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core.cpp
index 1bd6d3c0682..30c6dfec9f4 100644
--- a/src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core.cpp
+++ b/src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core.cpp
@@ -7,6 +7,7 @@ class MyObject
{
public:
int isReady();
+ bool startup();
};
// dummy function
@@ -25,3 +26,15 @@ int MyObject::isReady()
//! [1]
return 1;
}
+
+static bool startup()
+{
+//! [2]
+ MyObject obj;
+ obj.startup();
+ using namespace std::chrono_literals;
+ const bool result = QTest::qWaitFor([&obj]() { return obj.isReady(); },
+ QDeadlineTimer(3s));
+//! [2]
+ return result;
+}
diff --git a/src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core_snippet.cpp b/src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core_snippet.cpp
deleted file mode 100644
index f2ba321a674..00000000000
--- a/src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core_snippet.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (C) 2020 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-
-//! [0]
- MyObject obj;
- obj.startup();
- QTest::qWaitFor([&]() {
- return obj.isReady();
- }, 3000);
-//! [0]