From 57cf7c8a1bb1905294038ba5c98f1e8235fc08af Mon Sep 17 00:00:00 2001
From: Debao Zhang <dbzhang800@gmail.com>
Date: Fri, 9 Mar 2012 18:09:17 -0800
Subject: Clean up some auto tests of gui

These unit tests do not depent on QtWidget.

Change-Id: I95526125c563885c0531da7ebfee06bca9a87b1c
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
 .../qabstracttextdocumentlayout.pro                           |  2 +-
 tests/auto/gui/text/qstatictext/qstatictext.pro               |  2 +-
 tests/auto/gui/text/qstatictext/tst_qstatictext.cpp           | 11 +++++------
 tests/auto/gui/text/qtextblock/qtextblock.pro                 |  2 +-
 tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro       |  2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'tests/auto/gui/text')

diff --git a/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro b/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro
index 025b3f8a26..3848a287dc 100644
--- a/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro
+++ b/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro
@@ -4,7 +4,7 @@
 
 CONFIG += testcase
 TARGET = tst_qabstracttextdocumentlayout
-QT += widgets testlib
+QT += testlib
 SOURCES += tst_qabstracttextdocumentlayout.cpp
 
 
diff --git a/tests/auto/gui/text/qstatictext/qstatictext.pro b/tests/auto/gui/text/qstatictext/qstatictext.pro
index a0955af710..67f2e047a4 100644
--- a/tests/auto/gui/text/qstatictext/qstatictext.pro
+++ b/tests/auto/gui/text/qstatictext/qstatictext.pro
@@ -1,6 +1,6 @@
 CONFIG += testcase
 TARGET = tst_qstatictext
-QT += widgets widgets-private testlib
+QT += testlib
 QT += core core-private gui gui-private
 SOURCES  += tst_qstatictext.cpp
 
diff --git a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
index 66145f2dcf..fbb9549425 100644
--- a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
+++ b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <QtWidgets/QApplication>
+#include <QtGui/QGuiApplication>
 #include <QtGui/QPainter>
 #include <QtGui/QImage>
 
@@ -48,7 +48,6 @@
 #include <qpaintengine.h>
 
 #include <private/qstatictext_p.h>
-#include <private/qapplication_p.h>
 
 // #define DEBUG_SAVE_IMAGE
 
@@ -296,7 +295,7 @@ void tst_QStaticText::prepareToWrongData()
 
 void tst_QStaticText::setFont()
 {
-    QFont font = QApplication::font();
+    QFont font = QGuiApplication::font();
     font.setBold(true);
     font.setPointSize(28);
 
@@ -618,7 +617,7 @@ void tst_QStaticText::plainTextVsRichText()
 
 void tst_QStaticText::setPenPlainText()
 {
-    QFont font = QApplication::font();
+    QFont font = QGuiApplication::font();
     font.setStyleStrategy(QFont::NoAntialias);
 
     QFontMetricsF fm(font);
@@ -646,7 +645,7 @@ void tst_QStaticText::setPenPlainText()
 
 void tst_QStaticText::setPenRichText()
 {
-    QFont font = QApplication::font();
+    QFont font = QGuiApplication::font();
     font.setStyleStrategy(QFont::NoAntialias);
 
     QFontMetricsF fm(font);
@@ -675,7 +674,7 @@ void tst_QStaticText::setPenRichText()
 
 void tst_QStaticText::richTextOverridesPen()
 {
-    QFont font = QApplication::font();
+    QFont font = QGuiApplication::font();
     font.setStyleStrategy(QFont::NoAntialias);
 
     QFontMetricsF fm(font);
diff --git a/tests/auto/gui/text/qtextblock/qtextblock.pro b/tests/auto/gui/text/qtextblock/qtextblock.pro
index cad009a35a..cf3456bbf6 100644
--- a/tests/auto/gui/text/qtextblock/qtextblock.pro
+++ b/tests/auto/gui/text/qtextblock/qtextblock.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 TARGET = tst_qtextblock
 
-QT += widgets widgets-private testlib
+QT += testlib
 QT += core-private gui-private
 
 SOURCES  += tst_qtextblock.cpp
diff --git a/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro b/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro
index 930d18f5fe..1419e32012 100644
--- a/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro
+++ b/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro
@@ -1,6 +1,6 @@
 CONFIG += testcase
 TARGET = tst_qtextpiecetable
-QT += widgets widgets-private testlib
+QT += testlib
 QT += core-private gui-private
 SOURCES  += tst_qtextpiecetable.cpp
 HEADERS += ../qtextdocument/common.h
-- 
cgit v1.2.3