diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-06 11:13:42 (GMT) |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-09 16:05:48 (GMT) |
commit | 8447f5616be731d78081f326bb9cb3f5aa9087a4 (patch) | |
tree | 135f927439528851b1f06d62c002f06db2c50b82 /tests/auto/qstringbuilder2 | |
parent | ebc134db484eee31491836b619aad1ee86e3070e (diff) | |
download | Qt-8447f5616be731d78081f326bb9cb3f5aa9087a4.zip Qt-8447f5616be731d78081f326bb9cb3f5aa9087a4.tar.gz Qt-8447f5616be731d78081f326bb9cb3f5aa9087a4.tar.bz2 |
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
Diffstat (limited to 'tests/auto/qstringbuilder2')
-rw-r--r-- | tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp b/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp index 88b1f73..bcf88cb 100644 --- a/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp +++ b/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp @@ -45,8 +45,7 @@ // based version // with NO_CAST * defined #define P + -#define QT_USE_FAST_OPERATOR_PLUS -#define QT_USE_FAST_CONCATENATION +#define QT_USE_QSTRINGBUILDER #define QT_NO_CAST_FROM_ASCII #define QT_NO_CAST_TO_ASCII |