diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-23 22:21:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-23 22:21:50 (GMT) |
| commit | e5722f539888913b9bea4f91db95f5e2c5fceed1 (patch) | |
| tree | f1562de5cd28fa782d6285970c928972de1fb50c /doc | |
| parent | 3ac06f540761fa259317f773c8a4517e252623a3 (diff) | |
| parent | 51955cb4ca94b2a700cb276714bec77bdb1bc934 (diff) | |
| download | Qt-e5722f539888913b9bea4f91db95f5e2c5fceed1.zip Qt-e5722f539888913b9bea4f91db95f5e2c5fceed1.tar.gz Qt-e5722f539888913b9bea4f91db95f5e2c5fceed1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
We need to swallow the event, otherwise it might pop up several times.
Set the item data thru the model, so we actually emit dataChanged.
There where still references to the old Assistant.
Newly created folders in QFileDialog are disabled on Cocoa.
don't remove the path from the name of included files
add some comments
remove support for QMAKE_POST_INCLUDE_FILES
remove unused function
fix prompt() stdin safety check
Improve text performance with QtWebKit in Qt 4.7
Removed support for static linking of QtWebKit.
When a drag is finished with on Mac, then it should delete itself
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/platforms/compiler-notes.qdoc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/src/platforms/compiler-notes.qdoc b/doc/src/platforms/compiler-notes.qdoc index c365d88..7eb92e0 100644 --- a/doc/src/platforms/compiler-notes.qdoc +++ b/doc/src/platforms/compiler-notes.qdoc @@ -52,7 +52,7 @@ \table \header \o Compiler \o{5,1} Features - \header \o \o Concurrent \o XmlPatterns \o WebKit \o CLucene \o Phonon + \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 @@ -67,6 +67,8 @@ \row \o MSVC 2005 and up \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \endtable + * WebKit is only supported as a dynamically built library. Static linkage is not supported. + \target GCC \section1 GCC |