Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: tests: fixed or disabled qtbase tests with circular dependencies
2011-05-11 21:47:11 +10:00 · 2011-05-11 21:47:11 +10:00 · 8cd8e5e4cb
parent eb5ad10b2c 698b3da842
commit 8cd8e5e4cb
2 changed files with 2 additions and 2 deletions
--- 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 \
--- 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 \