From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Wed, 11 May 2011 09:57:01 +0000 (+1000)
Subject: tests: fixed or disabled qtbase tests with circular dependencies
X-Git-Tag: qt-v5.0.0-alpha1~4299^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=698b3da842cd9df9719354837723b3a3eecff6fe;p=profile%2Fivi%2Fqtbase.git

tests: fixed or disabled qtbase tests with circular dependencies

tst_lancelot did QT+=svg, but didn't actually use QtSvg.

qlocalsocket/lackey uses QtScript, which is not available when compiling
qtbase.

Change-Id: Ic3cc5a6f74a58ee8f2fdc48b9c852d9551b85f68
---

diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro
index 0d77fff..67de15c 100644
--- a/tests/auto/gui.pro
+++ b/tests/auto/gui.pro
@@ -102,7 +102,7 @@ SUBDIRS=\
     qlistview \
     qlistwidget \
     qlocale \
-    qlocalsocket \
+    #qlocalsocket \  # FIXME: uses qtscript, shouldn't be in qtbase
     qmacstyle \
     qmainwindow \
     qmatrixnxn \
diff --git a/tests/auto/lancelot/lancelot.pro b/tests/auto/lancelot/lancelot.pro
index 11beb7e..c4eaaac 100644
--- a/tests/auto/lancelot/lancelot.pro
+++ b/tests/auto/lancelot/lancelot.pro
@@ -1,5 +1,5 @@
 load(qttest_p4)
-QT += xml svg
+QT += xml
 contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl
 
 SOURCES += tst_lancelot.cpp \