diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-18 18:58:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-18 18:58:55 (GMT) |
| commit | 35b5f15c3fe5c2f1f0d046d09b9d95dee3bb91b5 (patch) | |
| tree | b245db305c7bd729d2d802b2eccbf44f294de1b4 /doc/src | |
| parent | f50a2555301e7e1d5e4bde32c380a3576e998407 (diff) | |
| parent | 3b7b05ce8db881acfdcf193b3c8fb3d4919eb1c2 (diff) | |
| download | Qt-35b5f15c3fe5c2f1f0d046d09b9d95dee3bb91b5.zip Qt-35b5f15c3fe5c2f1f0d046d09b9d95dee3bb91b5.tar.gz Qt-35b5f15c3fe5c2f1f0d046d09b9d95dee3bb91b5.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Symbian socket: Implement systemProxyForQuery for service networks
tst_q3dns: update test to follow RFC-5952.
Doc: update platform notes on Mac to reflect WA_MacNoCocoaChildWindow (cherry picked from commit b240f8a2ee3b7ff82a389fbf5dfd076792f385e8)
QT_USE_QSTRINGBUILDER to fix source compatibility
Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/platforms/platform-notes.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/snippets/qstring/stringbuilder.cpp | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc index 24b297f..aa39957 100644 --- a/doc/src/platforms/platform-notes.qdoc +++ b/doc/src/platforms/platform-notes.qdoc @@ -612,7 +612,7 @@ Qt::WA_MacNormalSize, Qt::WA_MacSmallSize, Qt::WA_MacMiniSize, Qt::WA_MacVariableSize, Qt::WA_MacBrushedMetal, Qt::WA_MacAlwaysShowToolWindow, Qt::WA_MacFrameworkScaled, Qt::WA_MacNoShadow, Qt::Sheet, Qt::Drawer, Qt::MacWindowToolBarButtonHint, - QMainWindow::unifiedTitleAndToolBarOnMac + QMainWindow::unifiedTitleAndToolBarOnMac, WA_MacNoCocoaChildWindow \section2 Mixing Qt with native code Two classes are awailable for either adding native Cocoa views/controls diff --git a/doc/src/snippets/qstring/stringbuilder.cpp b/doc/src/snippets/qstring/stringbuilder.cpp index 8ff1dd8..b8acbc1 100644 --- a/doc/src/snippets/qstring/stringbuilder.cpp +++ b/doc/src/snippets/qstring/stringbuilder.cpp @@ -49,14 +49,9 @@ //! [0] //! [3] - #define QT_USE_FAST_CONCATENATION + DEFINES *= QT_USE_QSTRINGBUILDER //! [3] -//! [4] - #define QT_USE_FAST_CONCATENATION - #define QT_USE_FAST_OPERATOR_PLUS -//! [4] - //! [5] #include <QStringBuilder> |