From 46c62433e8bd56e8284a086c2803f547b59e570e Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 5 Jul 2012 12:08:31 +0200
Subject: Implement qWaitForWindowShown using qWaitForWindowExposed.

Deprecate qWaitForWindowShown for Qt 6 as it is just a wrapper.

Change-Id: I0f8195679679120bd402e273fed4d331dc926708
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
---
 src/testlib/qtestsystem.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/testlib/qtestsystem.h')

diff --git a/src/testlib/qtestsystem.h b/src/testlib/qtestsystem.h
index 31c9f481c5..eb0fcb8178 100644
--- a/src/testlib/qtestsystem.h
+++ b/src/testlib/qtestsystem.h
@@ -120,10 +120,12 @@ namespace QTest
         return window->isExposed();
     }
 
-    inline static bool qWaitForWindowShown(QWindow *window, int timeout = 1000)
+#if QT_DEPRECATED_SINCE(6, 0)
+    QT_DEPRECATED inline static bool qWaitForWindowShown(QWindow *window, int timeout = 1000)
     {
-        return qWaitForWindowActive(window, timeout);
+        return qWaitForWindowExposed(window, timeout);
     }
+#endif // QT_DEPRECATED_SINCE(6, 0)
 }
 
 QT_END_NAMESPACE
-- 
cgit v1.2.3