diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-06 13:13:42 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-18 15:17:17 +0200 |
| commit | b57a7e6994abdab2b7ff7c7fc19549d66dbf598f (patch) | |
| tree | b429f1931a097a534b0a5291a9ccc2cbd2ccf8b8 /doc/src/snippets | |
| parent | 66f264f1153436cc0ace72e7ba16e077a284311c (diff) | |
QT_USE_QSTRINGBUILDER to fix source compatibility
In 4.8 we added support for using StringBuilder with QByteArray.
But this is breaking source compatibility for people that used
QT_USE_FAST_OPERATOR_PLUS in Qt 4.7. So we introduce a new macro
Notice that QT_USE_FAST_CONCATENATION was not working without
QT_USE_FAST_OPERATOR_PLUS, so we remove the checking of that macro.
Reviewed-by: joao
(cherry picked from commit 8447f5616be731d78081f326bb9cb3f5aa9087a4)
Diffstat (limited to 'doc/src/snippets')
| -rw-r--r-- | doc/src/snippets/qstring/stringbuilder.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/doc/src/snippets/qstring/stringbuilder.cpp b/doc/src/snippets/qstring/stringbuilder.cpp index 8ff1dd8206..b8acbc1e2a 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> |