diff options
Diffstat (limited to 'src')
5 files changed, 8 insertions, 10 deletions
diff --git a/src/plugins/compilationdatabaseprojectmanager/database_samples/qtc/compile_commands.json b/src/plugins/compilationdatabaseprojectmanager/database_samples/qtc/compile_commands.json index d971ebbf09..70b1905fe7 100644 --- a/src/plugins/compilationdatabaseprojectmanager/database_samples/qtc/compile_commands.json +++ b/src/plugins/compilationdatabaseprojectmanager/database_samples/qtc/compile_commands.json @@ -22,8 +22,7 @@ "-DQT_NO_CAST_TO_ASCII", "-DQT_RESTRICTED_CAST_FROM_ASCII", "-DQT_DISABLE_DEPRECATED_BEFORE=0x050600", - "-DQT_USE_FAST_OPERATOR_PLUS", - "-DQT_USE_FAST_CONCATENATION", + "-DQT_USE_QSTRINGBUILDER", "-DSRCDIR=\"C:/qt-creator/src/plugins/cpptools\"", "-DQT_QML_DEBUG", "-DQT_PLUGIN", diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp index 44274da954..09b1695e9a 100644 --- a/src/plugins/cpptools/cppcompletion_test.cpp +++ b/src/plugins/cpptools/cppcompletion_test.cpp @@ -427,11 +427,11 @@ static void enumTestCase(const QByteArray &tag, const QByteArray &source, QTest::newRow(tag) << fullSource << (prefix + "val") << QStringList({"val1", "val2", "val3"}); - QTest::newRow(tag + "_cxx11") << fullSource << (prefix + "E::") + QTest::newRow(QByteArray{tag + "_cxx11"}) << fullSource << QByteArray{prefix + "E::"} << QStringList({"E", "val1", "val2", "val3"}); fullSource.replace("enum E ", "enum "); - QTest::newRow(tag + "_anon") << fullSource << (prefix + "val") + QTest::newRow(QByteArray{tag + "_anon"}) << fullSource << QByteArray{prefix + "val"} << QStringList({"val1", "val2", "val3"}); } diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro index ec492d859f..916eb69330 100644 --- a/src/plugins/debugger/debugger.pro +++ b/src/plugins/debugger/debugger.pro @@ -1,5 +1,3 @@ -# DEFINES += QT_USE_FAST_OPERATOR_PLUS -# DEFINES += QT_USE_FAST_CONCATENATION # CONFIG += single include(../../qtcreatorplugin.pri) diff --git a/src/plugins/perfprofiler/perfconfigeventsmodel.cpp b/src/plugins/perfprofiler/perfconfigeventsmodel.cpp index bdd419ec8c..304adfa4a5 100644 --- a/src/plugins/perfprofiler/perfconfigeventsmodel.cpp +++ b/src/plugins/perfprofiler/perfconfigeventsmodel.cpp @@ -395,15 +395,16 @@ PerfConfigEventsModel::EventDescription PerfConfigEventsModel::parseEvent( if (!extras.isEmpty()) { QMetaEnum operationMeta = QMetaEnum::fromType<Operation>(); - int operation = operationMeta.keyToValue(QByteArray("Operation") - + extras.takeFirst().toLatin1()); + int operation = operationMeta.keyToValue( + QByteArray{"Operation" + extras.takeFirst().toLatin1()}); if (operation != -1) description.operation = operation; } if (!extras.isEmpty()) { QMetaEnum resultMeta = QMetaEnum::fromType<Result>(); - int result = resultMeta.keyToValue(QByteArray("Result") + extras.takeFirst().toLatin1()); + int result = resultMeta.keyToValue( + QByteArray{"Result" + extras.takeFirst().toLatin1()}); if (result != -1) description.result = Result(result); } diff --git a/src/plugins/scxmleditor/common/mainwidget.cpp b/src/plugins/scxmleditor/common/mainwidget.cpp index 766161cfdf..accc747e0a 100644 --- a/src/plugins/scxmleditor/common/mainwidget.cpp +++ b/src/plugins/scxmleditor/common/mainwidget.cpp @@ -402,7 +402,7 @@ QString saveImageFileFilter() { const auto imageFormats = QImageWriter::supportedImageFormats(); const QByteArrayList supportedFormats = Utils::transform(imageFormats, [](const QByteArray &in) - { return QByteArray("*.") + in; }); + { return QByteArray{"*." + in}; }); return MainWidget::tr("Images (%1)").arg(QString::fromUtf8(supportedFormats.join(' '))); } |