feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix build issues with Qt6

Browse Source 
Change from QStringRef to QStringView at various places.

Task-number: QTCREATORBUG-24098
Change-Id: Ia7a634fa26464fbb2962724d5f0e188cecc68801
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2020-09-18 13:18:30 +02:00
parent 2a70bc1d09
commit 6225d33c28
15 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/imageviewer/multiexportdialog.cpp
View File

@@ -54,7 +54,7 @@ static const int standardIconSizesValues[] = {16, 24, 32, 48, 64, 128, 256};
// Helpers to convert a size specifications from QString to QSize
// and vv. The format is '2x4' or '4' as shortcut for '4x4'.
static QSize sizeFromString(const QStringRef &r)
static QSize sizeFromString(const QString &r)
{
if (r.isEmpty())
return {};
@@ -104,9 +104,9 @@ static QVector<QSize> stringToSizes(const QString &s)
{
QVector<QSize> result;
const QString trimmed = s.trimmed();
const QVector<QStringRef> &sizes = trimmed.splitRef(',', Qt::SkipEmptyParts);
const QStringList &sizes = trimmed.split(',', Qt::SkipEmptyParts);
result.reserve(sizes.size());
for (const QStringRef &sizeSpec : sizes) {
for (const QString &sizeSpec : sizes) {
const QSize size = sizeFromString(sizeSpec);
if (!size.isValid() || size.isEmpty())
return {};