diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-27 10:08:25 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-11-30 13:46:55 +0000 |
| commit | 967efc19c0662b871a14273c4063aa35a7956935 (patch) | |
| tree | 2053f1bebbff3c5eb9e4978f12476e5214ab58ef /src/controls | |
| parent | c97e82387a294b5faab79d9101efdba6bda074e8 (diff) | |
QQuickStyleSelector: removed the env override
Change-Id: I0e42b339ddfff81ad9029cfbff14e21aee5178ff
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls')
| -rw-r--r-- | src/controls/qquickstyleselector.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/controls/qquickstyleselector.cpp b/src/controls/qquickstyleselector.cpp index 2cf297a9..49cb0150 100644 --- a/src/controls/qquickstyleselector.cpp +++ b/src/controls/qquickstyleselector.cpp @@ -46,9 +46,6 @@ QT_BEGIN_NAMESPACE -//Environment variable to allow tooling full control of file selectors -static const char env_override[] = "QT_LABS_CONTROLS_NO_STYLE"; - Q_GLOBAL_STATIC(QQuickStyleSelectorSharedData, sharedData); static QBasicMutex sharedDataMutex; @@ -183,9 +180,6 @@ void QQuickStyleSelectorPrivate::updateSelectors() if (envSelectors.count()) sharedData->staticSelectors << envSelectors; - if (!qEnvironmentVariableIsEmpty(env_override)) - return; - sharedData->staticSelectors << sharedData->preloadedStatics; //Potential for static selectors from other modules // TODO: Update on locale changed? |