X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ae59d894c2691b02e3ce63707b590ff797d9e7b6..8eb9b508ca87fb1d634d8b8ba62c054ed04466d2:/src/tests/dolphintreeviewtest.cpp

diff --git a/src/tests/dolphintreeviewtest.cpp b/src/tests/dolphintreeviewtest.cpp
index 18069125a..afcd34d2b 100644
--- a/src/tests/dolphintreeviewtest.cpp
+++ b/src/tests/dolphintreeviewtest.cpp
@@ -18,14 +18,14 @@
  *****************************************************************************/
 
 #include <qtest_kde.h>
-#include <kdebug.h>
-#include <kaction.h>
+#include <KDebug>
+#include <KAction>
 
 #include "views/dolphintreeview.h"
 
 #include <qtestkeyboard.h>
 #include <qtestmouse.h>
-#include <QtGui/QStringListModel>
+#include <QStringListModel>
 
 class DolphinTreeViewTest : public QObject
 {
@@ -373,10 +373,9 @@ void DolphinTreeViewTest::bug220898_focusOut()
     widget.setFocus();
 
     // Wait until the widgets have received the focus events
-    while (view.viewport()->hasFocus() || !widget.hasFocus()) {
+    while (view.viewport()->hasFocus()) {
         QTest::qWait(10);
     }
-    QVERIFY(widget.hasFocus());
     QVERIFY(!view.viewport()->hasFocus());
 
     // Release the "Down" key
@@ -387,11 +386,10 @@ void DolphinTreeViewTest::bug220898_focusOut()
     view.viewport()->setFocus();
 
     // Wait until the widgets have received the focus events
-    while (!view.viewport()->hasFocus() || widget.hasFocus()) {
+    while (widget.hasFocus()) {
         QTest::qWait(10);
     }
     QVERIFY(!widget.hasFocus());
-    QVERIFY(view.viewport()->hasFocus());
 
     // Press left mouse button below the last item
     const int lastRowHeight = view.sizeHintForRow(4);