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 /tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp | |
| 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 'tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp')
| -rw-r--r-- | tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp b/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp index 36b6b80e51..463f200043 100644 --- a/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp +++ b/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp @@ -44,8 +44,7 @@ // this is the "no harm done" version. Only operator% is active, // with NO_CAST * defined #define P % -#undef QT_USE_FAST_OPERATOR_PLUS -#undef QT_USE_FAST_CONCATENATION +#undef QT_USE_QSTRINGBUILDER #define QT_NO_CAST_FROM_ASCII #define QT_NO_CAST_TO_ASCII |