From 967efc19c0662b871a14273c4063aa35a7956935 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 27 Nov 2015 10:08:25 +0100 Subject: QQuickStyleSelector: removed the env override Change-Id: I0e42b339ddfff81ad9029cfbff14e21aee5178ff Reviewed-by: J-P Nurmi --- src/controls/qquickstyleselector.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/controls') 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? -- cgit v1.2.3