aboutsummaryrefslogtreecommitdiffstats
path: root/src/quickcontrols2
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2017-08-17 14:54:24 +0200
committerMitch Curtis <mitch.curtis@qt.io>2017-08-22 10:12:19 +0000
commit4578a32ba48d3c352ed336e4609dd39adff4a560 (patch)
treefea4617d108dedb7b1135a9d35a388090a7b7ec1 /src/quickcontrols2
parent8b2e9baa2148d2fdd4a1c3e4c8f66e11c62e1f2e (diff)
QQuickStyle: fix warning about empty filename
0dee566e98f5ff4f224e596de1c04de4f9685df4 (in qtbase) added a check for empty file names to QFileSystemEngine, and we run into that: Empty filename passed to function The fix is to check for empty file names before calling QFile::exists(). Change-Id: I273ea62f97ddcbf5b1a7952405a67ccb45c7672a Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/quickcontrols2')
-rw-r--r--src/quickcontrols2/qquickstyle.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp
index 48d1dc17..c4555ee7 100644
--- a/src/quickcontrols2/qquickstyle.cpp
+++ b/src/quickcontrols2/qquickstyle.cpp
@@ -239,7 +239,7 @@ struct QQuickStyleSpec
{
if (configFilePath.isEmpty()) {
configFilePath = QFile::decodeName(qgetenv("QT_QUICK_CONTROLS_CONF"));
- if (!QFile::exists(configFilePath)) {
+ if (configFilePath.isEmpty() || !QFile::exists(configFilePath)) {
if (!configFilePath.isEmpty())
qWarning("QT_QUICK_CONTROLS_CONF=%s: No such file", qPrintable(configFilePath));