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

QmlDesigner: Fix a few more Qt deprecation related warnings

Browse Source 
Change-Id: I245693e0aa58454f631b9150cd86f3034c5cfbe6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2023-06-09 09:32:42 +02:00
parent d93d1743fd
commit e98c523b3f
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -264,13 +264,13 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa
m_extraAppParams = runControl->commandLine().arguments();
if (auto aspect = runControl->aspect(Constants::ANDROID_AM_START_ARGS)) {
QTC_CHECK(aspect->value.type() == QVariant::String);
QTC_CHECK(aspect->value.typeId() == QVariant::String);
const QString startArgs = aspect->value.toString();
m_amStartExtraArgs = ProcessArgs::splitArgs(startArgs, OsTypeOtherUnix);
}
if (auto aspect = runControl->aspect(Constants::ANDROID_PRESTARTSHELLCMDLIST)) {
QTC_CHECK(aspect->value.type() == QVariant::String);
QTC_CHECK(aspect->value.typeId() == QVariant::String);
const QStringList commands = aspect->value.toString().split('\n', Qt::SkipEmptyParts);
for (const QString &shellCmd : commands)
m_beforeStartAdbCommands.append(QString("shell %1").arg(shellCmd));

8
src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp
View File

@@ -149,7 +149,7 @@ void MaterialEditorView::changeValue(const QString &name)
if (name == "state" && castedValue.toString() == "base state")
castedValue = "";
if (castedValue.type() == QVariant::Color) {
if (castedValue.typeId() == QVariant::Color) {
QColor color = castedValue.value<QColor>();
QColor newColor = QColor(color.name());
newColor.setAlpha(color.alpha());
@@ -161,9 +161,9 @@ void MaterialEditorView::changeValue(const QString &name)
} else {
// QVector*D(0, 0, 0) detects as null variant though it is valid value
if (castedValue.isValid()
&& (!castedValue.isNull() || castedValue.type() == QVariant::Vector2D
|| castedValue.type() == QVariant::Vector3D
|| castedValue.type() == QVariant::Vector4D)) {
&& (!castedValue.isNull() || castedValue.typeId() == QVariant::Vector2D
|| castedValue.typeId() == QVariant::Vector3D
|| castedValue.typeId() == QVariant::Vector4D)) {
commitVariantValueToModel(propertyName, castedValue);
}
}

8
src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
View File

@@ -202,7 +202,7 @@ void PropertyEditorView::changeValue(const QString &name)
if (name == "state" && castedValue.toString() == "base state")
castedValue = "";
if (castedValue.type() == QVariant::Color) {
if (castedValue.typeId() == QVariant::Color) {
QColor color = castedValue.value<QColor>();
QColor newColor = QColor(color.name());
newColor.setAlpha(color.alpha());
@@ -215,9 +215,9 @@ void PropertyEditorView::changeValue(const QString &name)
} else {
// QVector*D(0, 0, 0) detects as null variant though it is valid value
if (castedValue.isValid()
&& (!castedValue.isNull() || castedValue.type() == QVariant::Vector2D
|| castedValue.type() == QVariant::Vector3D
|| castedValue.type() == QVariant::Vector4D)) {
&& (!castedValue.isNull() || castedValue.typeId() == QVariant::Vector2D
|| castedValue.typeId() == QVariant::Vector3D
|| castedValue.typeId() == QVariant::Vector4D)) {
commitVariantValueToModel(propertyName, castedValue);
}
}

6
src/plugins/qmldesigner/components/textureeditor/textureeditorview.cpp
View File

@@ -153,9 +153,9 @@ void TextureEditorView::changeValue(const QString &name)
} else {
// QVector*D(0, 0, 0) detects as null variant though it is valid value
if (castedValue.isValid()
&& (!castedValue.isNull() || castedValue.type() == QVariant::Vector2D
|| castedValue.type() == QVariant::Vector3D
|| castedValue.type() == QVariant::Vector4D)) {
&& (!castedValue.isNull() || castedValue.typeId() == QVariant::Vector2D
|| castedValue.typeId() == QVariant::Vector3D
|| castedValue.typeId() == QVariant::Vector4D)) {
commitVariantValueToModel(propertyName, castedValue);
}
}