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
This commit is contained in:
Qt Continuous Integration System 2011-05-13 09:47:50 +10:00
commit 0add5fe930
3 changed files with 3 additions and 4 deletions

View File

@ -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 \

View File

@ -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 \

View File

@ -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 \