diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-10-09 11:35:16 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-10-09 11:35:16 (GMT) |
| commit | 6a5be55e5f96758daeca44899bc8598c76c214e7 (patch) | |
| tree | 84d1c808bd491a29bbd265e515563ef79dbc3213 /doc/src | |
| parent | b8eb2784a1c1a9812d09fca7c8722624f12dbd1c (diff) | |
| parent | 2caa16ff98348b043ecc3598e5b9af4a2e2ae3bc (diff) | |
| download | Qt-6a5be55e5f96758daeca44899bc8598c76c214e7.zip Qt-6a5be55e5f96758daeca44899bc8598c76c214e7.tar.gz Qt-6a5be55e5f96758daeca44899bc8598c76c214e7.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/platforms/compiler-notes.qdoc | 14 | ||||
| -rw-r--r-- | doc/src/qt4-intro.qdoc | 5 |
2 files changed, 15 insertions, 4 deletions
diff --git a/doc/src/platforms/compiler-notes.qdoc b/doc/src/platforms/compiler-notes.qdoc index 5b5240a..4577bf0 100644 --- a/doc/src/platforms/compiler-notes.qdoc +++ b/doc/src/platforms/compiler-notes.qdoc @@ -204,10 +204,22 @@ \section2 Sun Studio - Qt is tested using Sun Studio 8 (Sun CC 5.5). Go to + Qt is tested using Sun Studio 12 (Sun CC 5.9). Go to \l{Sun Studio Patches} page on Sun's Web site to download the latest patches for your Sun compiler. + Please note that Qt 4.6 is stricter in its STL requirements and + that the default STL implementation used by Sun CC does not pass + those requirements. This does not affect binary compatibility and + you can continue to use STL in your own code, but Qt's + STL-compatibility functions will be disabled. + + Sun CC ships with a secondary STL implementation (called stlport4) + which is standards-compliant and can be used by Qt. You can enable + it by passing the -library=stlport4 option to the compiler. Note + that this does not affect Qt's binary compatibility, but it may + affect that of other libraries and programs that use STL. + \section2 Sun WorkShop 5.0 Sun WorkShop 5.0 is not supported with Qt 4. diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index 6224cd4..38f346f 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -661,10 +661,9 @@ See the \l{QtMultimedia Module} documentation for more information. - \section1 Classes, functions, and other items introduced in 4.6 + \section1 Classes, functions, etc new in 4.6 - Links to classes, function, and other items that were added in - 4.6. + Links to classes, functions, and other items that are new in 4.6. \sincelist 4.6 |