diff options
| author | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-19 16:56:55 +0300 |
|---|---|---|
| committer | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-19 16:56:55 +0300 |
| commit | 94051a438e64eaede021b4e926ef58f793a09a70 (patch) | |
| tree | 9860dc49d8e6453df356f51da9126b583ac35206 /tests/auto/qstringbuilder1 | |
| parent | 06557b8d7c472c6298f7d8b310feda225864265f (diff) | |
| parent | 35b5f15c3fe5c2f1f0d046d09b9d95dee3bb91b5 (diff) | |
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'tests/auto/qstringbuilder1')
| -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 9f81958ac7..134da1d877 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 |