diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-13 09:47:50 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-13 09:47:50 +1000 |
| commit | 0add5fe930e275924813376bb06cbfc0f5f779d3 (patch) | |
| tree | f4139f5c3c50d30bb0835a412ae504833a2e96b7 | |
| parent | cdd524ea979342aa7a8d2a4469ce53b2a859d308 (diff) | |
| parent | bef27c48ef49b6a5b511da47ab0d78fc254bcd07 (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
tests: add bug numbers to a few FIXMEs
| -rw-r--r-- | tests/auto/gui.pro | 2 | ||||
| -rw-r--r-- | tests/auto/host.pro | 2 | ||||
| -rw-r--r-- | tests/auto/other.pro | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro index afa6ad3a55..df161f1fb2 100644 --- a/tests/auto/gui.pro +++ b/tests/auto/gui.pro @@ -103,7 +103,7 @@ SUBDIRS=\ qlistview \ qlistwidget \ qlocale \ - #qlocalsocket \ # FIXME: uses qtscript, shouldn't be in qtbase + #qlocalsocket \ # FIXME: uses qtscript (QTBUG-19242) qmacstyle \ qmainwindow \ qmatrixnxn \ diff --git a/tests/auto/host.pro b/tests/auto/host.pro index 2b862d2447..18d0009b8f 100644 --- a/tests/auto/host.pro +++ b/tests/auto/host.pro @@ -3,7 +3,7 @@ SUBDIRS=\ compiler \ headersclean \ maketestselftest \ - #moc \ # FIXME: cannot be built as part of qtbase, since it depends on qtsvg + #moc \ # FIXME: uses qtsvg (QTBUG-19243) uic \ qmake \ rcc \ diff --git a/tests/auto/other.pro b/tests/auto/other.pro index c52014a192..a84ab05104 100644 --- a/tests/auto/other.pro +++ b/tests/auto/other.pro @@ -10,8 +10,7 @@ SUBDIRS=\ qalgorithms \ qcombobox \ qcssparser \ - #qdatastream \ # FIXME: cannot be enabled by default in qtbase, - # since it depends on qtsvg + #qdatastream \ # FIXME: uses qtsvg (QTBUG-19244) qdir \ qfocusevent \ qimage \ |