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

Android: Make compile with Qt6 again

Browse Source 
Use the special exception to use 'auto' for the return type of
QXmlStreamAttributes::values() to avoid preprocessor use.

Task-number: QTCREATORBUG-24098
Change-Id: I52362e6af6db728cb296bba033f9bfa08e93ca1b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-11-26 15:30:16 +01:00
parent d8eacfb863
commit 5951b26f1a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/splashscreencontainerwidget.cpp
View File

@@ -414,13 +414,13 @@ void SplashScreenContainerWidget::loadSplashscreenDrawParams(const QString &name
} else { } else {
if (reader.name() == QLatin1String("solid")) { if (reader.name() == QLatin1String("solid")) {
const QXmlStreamAttributes attributes = reader.attributes(); const QXmlStreamAttributes attributes = reader.attributes();
const QStringRef color = attributes.value(QLatin1String("android:color")); const auto color = attributes.value(QLatin1String("android:color"));
if (!color.isEmpty()) if (!color.isEmpty())
setBackgroundColor(QColor(color)); setBackgroundColor(QColor(color));
} }
else if (reader.name() == QLatin1String("bitmap")) { else if (reader.name() == QLatin1String("bitmap")) {
const QXmlStreamAttributes attributes = reader.attributes(); const QXmlStreamAttributes attributes = reader.attributes();
const QStringRef showMode = attributes.value(QLatin1String("android:gravity")); const auto showMode = attributes.value(QLatin1String("android:gravity"));
if (!showMode.isEmpty()) if (!showMode.isEmpty())
setImageShowMode(showMode.toString()); setImageShowMode(showMode.toString());
} }