diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-09-05 10:13:04 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-09-05 08:22:56 +0000 |
| commit | 33c5f4c3ad73fa2e75fe7ba69f5359e69adb212f (patch) | |
| tree | c388656f36b647c607e4aa828d3d8513da2a37fb | |
| parent | 843f1add60219171eb7deb6e9724f100284aab06 (diff) | |
| download | qtquickcontrols-33c5f4c3ad73fa2e75fe7ba69f5359e69adb212f.tar.gz | |
Check for empty style returned from environment
Fix warning
"Empty filename passed to function"
when running Qt Creator 4.4 against Qt 5.10
(see qtbase: 0dee566e98f5ff4f224e596de1c04de4f9685df4).
Change-Id: I0b71a873245a28ef972c105e7d41347e6b0fb38a
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| -rw-r--r-- | src/controls/Private/qquickcontrolsettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp index c7f641cc..d8cfdaed 100644 --- a/src/controls/Private/qquickcontrolsettings.cpp +++ b/src/controls/Private/qquickcontrolsettings.cpp @@ -222,7 +222,7 @@ QQuickControlSettings1::QQuickControlSettings1(QQmlEngine *engine) // If the style name is a path.. const QString styleNameFromEnvVar = styleEnvironmentVariable(); - if (QFile::exists(styleNameFromEnvVar)) { + if (!styleNameFromEnvVar.isEmpty() && QFile::exists(styleNameFromEnvVar)) { StyleData styleData; styleData.m_styleDirPath = styleNameFromEnvVar; m_styleMap[m_name] = styleData; |