summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2017-01-02 13:27:01 +0000
committerJani Heikkinen <jani.heikkinen@qt.io>2017-01-03 18:48:12 +0000
commit32605e5e25ebcc8de0ca0a8327248e6d28853cd4 (patch)
tree1729d2ef14e95f4b1ccde086926d3e816ce8906a
parentcf1f4f00f5fb3868a44727f0b214e8e6ece47e2c (diff)
Don't abort when getting an unknown/undefined uniform value
Instead print out a runtime warning so that the developer can identify and fix it. The implementation will use a default constructed UniformValue. Task-number: QTBUG-57710 Change-Id: I2a344284c3bcd9b7310324f420e6544c73101dff Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r--src/render/backend/uniform.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/backend/uniform.cpp b/src/render/backend/uniform.cpp
index 821dd6992..c2088b60f 100644
--- a/src/render/backend/uniform.cpp
+++ b/src/render/backend/uniform.cpp
@@ -226,7 +226,7 @@ UniformValue UniformValue::fromVariant(const QVariant &variant)
}
default:
- Q_UNREACHABLE();
+ qWarning() << "Unknown uniform type or value:" << variant << "Please check your QParameters";
}
return v;
}