diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2018-12-20 18:11:22 +0100 |
|---|---|---|
| committer | Miguel Costa <miguel.costa@qt.io> | 2019-01-07 14:33:15 +0000 |
| commit | e76a53f6d5816d102c9c7b876c6c175f74056b10 (patch) | |
| tree | 14456699ffcbf536a71af2c18c8b0f59a7f3c806 | |
| parent | 18eab5829fbae7da9cb8e2ace856baf4cc90357b (diff) | |
Disable QML debug by default
Debugging QML code is now disabled by default. Users must explicitly
enable QML debugging in the project Qt settings.
Task-number: QTVSADDINBUG-599
Change-Id: I5509d045eab49a35abfb58995790175d26008650
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| -rw-r--r-- | src/qtprojectlib/QtProject.cs | 26 | ||||
| -rw-r--r-- | src/qtvstools/DteEventsHandler.cs | 3 |
2 files changed, 0 insertions, 29 deletions
diff --git a/src/qtprojectlib/QtProject.cs b/src/qtprojectlib/QtProject.cs index b90c2c32..e6a3f54c 100644 --- a/src/qtprojectlib/QtProject.cs +++ b/src/qtprojectlib/QtProject.cs @@ -85,7 +85,6 @@ namespace QtProjectLib dte = envPro.DTE; vcPro = envPro.Object as VCProject; qtMsBuild = new QtMsBuildContainer(new VCPropertyStorageProvider()); - InitializeQmlJsDebugger(vcPro); } public VCProject VCProject @@ -3406,7 +3405,6 @@ namespace QtProjectLib } HelperFunctions.SetDebuggingEnvironment(envPro); - InitializeQmlJsDebugger(envPro.Object as VCProject); } public class CppConfig @@ -3514,30 +3512,6 @@ namespace QtProjectLib } } - public static bool IsQmlJsDebuggerInitialized(VCProject vcPro) - { - foreach (var config in GetCppDebugConfigs(vcPro)) { - var qmlDebugSettings = config.GetUserPropertyValue("QmlDebugSettings"); - if (string.IsNullOrEmpty(qmlDebugSettings)) - return false; - - if (qmlDebugSettings != "false" && !IsQtQmlDebugDefined(vcPro)) - return false; - } - return true; - } - - public static void InitializeQmlJsDebugger(VCProject vcPro) - { - if (vcPro == null || !IsQtMsBuildEnabled(vcPro)) - return; - - if (!IsQmlJsDebuggerInitialized(vcPro)) { - DefineQtQmlDebug(vcPro); - DefineQmlJsDebugger(vcPro); - } - } - public static bool IsQmlJsDebuggerDefined(VCProject vcPro) { foreach (var config in GetCppDebugConfigs(vcPro)) { diff --git a/src/qtvstools/DteEventsHandler.cs b/src/qtvstools/DteEventsHandler.cs index 3e0051a6..1bbf226e 100644 --- a/src/qtvstools/DteEventsHandler.cs +++ b/src/qtvstools/DteEventsHandler.cs @@ -574,9 +574,6 @@ namespace QtVsTools } } } - - // Initialize QML debugger settings - QtProject.InitializeQmlJsDebugger(vcPrj); } private void OnVCProjectEngineItemPropertyChange(object item, object tool, int dispid) |