diff options
| author | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2011-06-12 18:28:07 (GMT) |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2011-06-12 18:30:07 (GMT) |
| commit | 999baebd708fb588d1ac13badd513cd09e4b0c45 (patch) | |
| tree | 179011eee7f6892b62548f870ade14ad412fa79e /doc/src/snippets/qstring/stringbuilder.cpp | |
| parent | da9b2156015a946122eacc64437d214d1e184f35 (diff) | |
| parent | 7e6a9419fa2167941c601751a13a4451ef8d2708 (diff) | |
| download | Qt-999baebd708fb588d1ac13badd513cd09e4b0c45.zip Qt-999baebd708fb588d1ac13badd513cd09e4b0c45.tar.gz Qt-999baebd708fb588d1ac13badd513cd09e4b0c45.tar.bz2 | |
Merge remote-tracking branch 'upstream/4.8' into 4.8
Diffstat (limited to 'doc/src/snippets/qstring/stringbuilder.cpp')
| -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 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> |