diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-11 21:47:11 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-11 21:47:11 +1000 |
| commit | 8cd8e5e4cb9b8222bf6afdb980424bb571e0f977 (patch) | |
| tree | 748cd7153a944123e736791c3e7c146cc896753b /tests | |
| parent | eb5ad10b2cc954919e224f3c18c05898b52e0403 (diff) | |
| parent | 698b3da842cd9df9719354837723b3a3eecff6fe (diff) | |
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
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui.pro | 2 | ||||
| -rw-r--r-- | tests/auto/lancelot/lancelot.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro index b7d4ad30b7..d016f91fea 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 11beb7ef29..c4eaaac6ab 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 \ |