diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-02-19 15:52:44 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-02-20 09:49:54 +0000 |
| commit | 48dd6b7e4a03811a9a113aef2687d34db726a856 (patch) | |
| tree | 33e91e3b4e8f0c1556501ab20e25330505041f8a /src/quickcontrols2 | |
| parent | 1ceb8efeef7cf2f32ab069e0939a96e26ba1a9f6 (diff) | |
QQuickStyle: fix and test QT_QUICK_CONTROLS_CONF
Reset QT_QUICK_CONTROLS_CONF when appropriate, and add some tests
too since the environment variable is now public and documented.
Change-Id: I09fba950de7c34f22c4cf802ea5c0a337c84f0bd
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quickcontrols2')
| -rw-r--r-- | src/quickcontrols2/qquickstyle.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp index 800341d7..daa48144 100644 --- a/src/quickcontrols2/qquickstyle.cpp +++ b/src/quickcontrols2/qquickstyle.cpp @@ -233,6 +233,7 @@ struct QQuickStyleSpec style.clear(); fallbackStyle.clear(); fallbackMethod.clear(); + configFilePath.clear(); } QString resolveConfigFilePath() |