diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-01-07 00:51:34 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-01-07 00:51:34 (GMT) |
| commit | 5b67b61150771cf978648a35db201345d6fb37ae (patch) | |
| tree | c8927dd65b3d1edeff76fd21ac0c49b7ace72bf6 /doc/src/platforms/platform-notes.qdoc | |
| parent | c527a1ee371c4758776217e7d16c75e20fe6f5aa (diff) | |
| parent | 9cc21c043238dc7576a465c9d236e8968fd8c549 (diff) | |
| download | Qt-5b67b61150771cf978648a35db201345d6fb37ae.zip Qt-5b67b61150771cf978648a35db201345d6fb37ae.tar.gz Qt-5b67b61150771cf978648a35db201345d6fb37ae.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
Diffstat (limited to 'doc/src/platforms/platform-notes.qdoc')
| -rw-r--r-- | doc/src/platforms/platform-notes.qdoc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc index 177d3f6..b745867 100644 --- a/doc/src/platforms/platform-notes.qdoc +++ b/doc/src/platforms/platform-notes.qdoc @@ -81,14 +81,11 @@ \header \o \o Concurrent \o XmlPatterns \o WebKit(*) \o CLucene \o Phonon \row \o g++ 3.3 \o \o \bold{X} \o \o \bold{X} \o \bold{X} \row \o g++ 3.4 and up \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} - \row \row \o SunCC 5.5 \o \o \o \o \bold{X} \o \bold{X} - \row \row \o aCC series 3 \o \o \o \o \bold{X} \o \bold{X} \row \o aCC series 6 \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \row \o xlC 6 \o \o \o \o \bold{X} \o \bold{X} \row \o Intel CC 10 \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} - \row \row \o MSVC 2003 \o \bold{X} \o \bold{X} \o \o \bold{X} \o \bold{X} \row \o MSVC 2005 and up \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \endtable |