diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-03-04 09:54:35 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-03-04 19:10:37 +0000 |
| commit | a0ffdf765e34820b591bcb9d1bee6df0985056cf (patch) | |
| tree | 2328cacb6547e7de3535a968d234aa84942b445f /src/corelib/text/qstring.cpp | |
| parent | d57adfe5f375121c3e233465526ee5d9df03e1e9 (diff) | |
| parent | 2a4b95778993b00499eb94f61a87330fdbadf947 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/corelib/text/qstring.cpp')
| -rw-r--r-- | src/corelib/text/qstring.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index da2c44bef6..757f248e8a 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -7626,7 +7626,10 @@ static ResultList splitString(const StringSource &source, const QChar *sep, #if QT_DEPRECATED_SINCE(5, 15) Qt::SplitBehavior mapSplitBehavior(QString::SplitBehavior sb) { +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED return sb & QString::SkipEmptyParts ? Qt::SkipEmptyParts : Qt::KeepEmptyParts; +QT_WARNING_POP } #endif |