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 /src/qbase.pri | |
| 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 'src/qbase.pri')
| -rw-r--r-- | src/qbase.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qbase.pri b/src/qbase.pri index 03f85cf931..cf02978853 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -174,7 +174,7 @@ contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE DEFINES *= QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS contains(QT_CONFIG, gui-qt3support):DEFINES *= QT3_SUPPORT DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code -DEFINES *= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION +DEFINES *= QT_USE_QSTRINGBUILDER TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end |