aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@crimson.no>2017-01-05 21:07:35 +0100
committerRobin Burchell <robin.burchell@crimson.no>2017-01-13 20:14:07 +0000
commit0c65ffef9b021555c03081e4e60e91a268d46c98 (patch)
tree40be4ab28c3bc754105b9f8d04dfa118cc0bb00d /src/imports/controls
parent6d00ed2d5328e605bf846622a9dbe4dfe821aee4 (diff)
QtQuickControls2: Use the newly-introduced qmlWarning instead of qmlInfo
qmlInfo will shortly be returning info-level messages (as the name hints), rather than warning level messages. Change-Id: I94123464b12b30a4ba085cfb7b606bc26df9b76e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/imports/controls')
-rw-r--r--src/imports/controls/material/qquickmaterialstyle.cpp4
-rw-r--r--src/imports/controls/universal/qquickuniversalstyle.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp
index e4d7e4cd..788c0cf2 100644
--- a/src/imports/controls/material/qquickmaterialstyle.cpp
+++ b/src/imports/controls/material/qquickmaterialstyle.cpp
@@ -1255,7 +1255,7 @@ bool QQuickMaterialStyle::variantToRgba(const QVariant &var, const char *name, Q
if (var.type() == QVariant::Int) {
int val = var.toInt();
if (val > BlueGrey) {
- qmlInfo(parent()) << "unknown Material." << name << " value: " << val;
+ qmlWarning(parent()) << "unknown Material." << name << " value: " << val;
return false;
}
*rgba = val;
@@ -1266,7 +1266,7 @@ bool QQuickMaterialStyle::variantToRgba(const QVariant &var, const char *name, Q
} else {
QColor color(var.toString());
if (!color.isValid()) {
- qmlInfo(parent()) << "unknown Material." << name << " value: " << var.toString();
+ qmlWarning(parent()) << "unknown Material." << name << " value: " << var.toString();
return false;
}
*custom = true;
diff --git a/src/imports/controls/universal/qquickuniversalstyle.cpp b/src/imports/controls/universal/qquickuniversalstyle.cpp
index da924ce9..a793034a 100644
--- a/src/imports/controls/universal/qquickuniversalstyle.cpp
+++ b/src/imports/controls/universal/qquickuniversalstyle.cpp
@@ -603,7 +603,7 @@ bool QQuickUniversalStyle::variantToRgba(const QVariant &var, const char *name,
if (var.type() == QVariant::Int) {
int val = var.toInt();
if (val < Lime || val > Taupe) {
- qmlInfo(parent()) << "unknown Universal." << name << " value: " << val;
+ qmlWarning(parent()) << "unknown Universal." << name << " value: " << val;
return false;
}
*rgba = qquickuniversal_accent_color(static_cast<Color>(val));
@@ -614,7 +614,7 @@ bool QQuickUniversalStyle::variantToRgba(const QVariant &var, const char *name,
} else {
QColor color(var.toString());
if (!color.isValid()) {
- qmlInfo(parent()) << "unknown Universal." << name << " value: " << var.toString();
+ qmlWarning(parent()) << "unknown Universal." << name << " value: " << var.toString();
return false;
}
*rgba = color.rgba();