Merge branch 'frameworks'

1 files changed, 6 insertions, 4 deletions

diff --git a/src/tests/kstandarditemmodeltest.cpp b/src/tests/kstandarditemmodeltest.cpp
index 2de0d0b78..889748f35 100644
--- a/src/tests/kstandarditemmodeltest.cpp
+++ b/src/tests/kstandarditemmodeltest.cpp
@@ -18,11 +18,13 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include <qtest_kde.h>
+#include "dolphindebug.h"
 
 #include "kitemviews/kstandarditem.h"
 #include "kitemviews/kstandarditemmodel.h"
 
+#include <QTest>
+
 class KStandardItemModelTest : public QObject
 {
     Q_OBJECT
@@ -98,13 +100,13 @@ bool KStandardItemModelTest::isModelConsistent() const
     for (int i = 0; i < m_model->count(); ++i) {
         const KStandardItem* item = m_model->item(i);
         if (!item) {
-            qWarning() << "Item" << i << "is null";
+            qCWarning(DolphinDebug) << "Item" << i << "is null";
             return false;
         }
 
         const int itemIndex = m_model->index(item);
         if (itemIndex != i) {
-            qWarning() << "Item" << i << "has a wrong index:" << itemIndex;
+            qCWarning(DolphinDebug) << "Item" << i << "has a wrong index:" << itemIndex;
             return false;
         }
     }
@@ -112,6 +114,6 @@ bool KStandardItemModelTest::isModelConsistent() const
     return true;
 }
 
-QTEST_KDEMAIN(KStandardItemModelTest, NoGUI)
+QTEST_GUILESS_MAIN(KStandardItemModelTest)
 
 #include "kstandarditemmodeltest.moc"