From 5951b613741389508cd580629caa0ea93a35b43b Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Tue, 5 Jun 2012 14:02:51 +0200
Subject: Make qtextdocumentlayout autotest build without widgets

Change-Id: Ib767f9cac5fc3274ed16e87f0c4da68102147645
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro     | 3 ++-
 tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

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

diff --git a/tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro b/tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro
index bb74050511..1ebbd8a7bf 100644
--- a/tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro
+++ b/tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro
@@ -1,7 +1,8 @@
 CONFIG += testcase
 CONFIG += parallel_test
 TARGET = tst_qtextdocumentlayout
-QT += widgets testlib
+QT += testlib
+!contains(QT_CONFIG, no-widgets) QT += widgets
 SOURCES += tst_qtextdocumentlayout.cpp
 
 
diff --git a/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp b/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
index 20b72ffa1b..a9c111e83f 100644
--- a/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
+++ b/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
@@ -47,8 +47,10 @@
 #include <qdebug.h>
 #include <qpainter.h>
 #include <qtexttable.h>
+#ifndef QT_NO_WIDGETS
 #include <qtextedit.h>
 #include <qscrollbar.h>
+#endif
 
 class tst_QTextDocumentLayout : public QObject
 {
@@ -66,7 +68,9 @@ private slots:
     void defaultPageSizeHandling();
     void idealWidth();
     void lineSeparatorFollowingTable();
+#ifndef QT_NO_WIDGETS
     void wrapAtWordBoundaryOrAnywhere();
+#endif
     void inlineImage();
     void clippedTableCell();
     void floatingTablePageBreak();
@@ -180,6 +184,7 @@ void tst_QTextDocumentLayout::lineSeparatorFollowingTable()
     }
 }
 
+#ifndef QT_NO_WIDGETS
 void tst_QTextDocumentLayout::wrapAtWordBoundaryOrAnywhere()
 {
     //task 150562
@@ -192,6 +197,7 @@ void tst_QTextDocumentLayout::wrapAtWordBoundaryOrAnywhere()
     edit.show();
     QVERIFY(!edit.horizontalScrollBar()->isVisible());
 }
+#endif
 
 void tst_QTextDocumentLayout::inlineImage()
 {
-- 
cgit v1.2.3