Make enabling the qml debugger depend on the -qmljsdebugger command line option being there or not

Author: tsdgeos

src/Dash/main.cpp

@@ -27,13 +27,18 @@
 #include <libintl.h>
 
 #include <paths.h>
+#include "../qmldebuggerutils.h"
 #ifdef UNITY8_ENABLE_TOUCH_EMULATION
     #include "../MouseTouchAdaptor.h"
 #endif
 #include "../CachingNetworkManagerFactory.h"
 
 int main(int argc, const char *argv[])
 {
+    if (enableQmlDebugger(argc, argv)) {
+        QQmlDebuggingEnabler qQmlEnableDebuggingHelper(true);
+    }
+
     QGuiApplication *application = new QGuiApplication(argc, (char**)argv);
 
     QCommandLineParser parser;
@@ -73,10 +78,6 @@ int main(int argc, const char *argv[])
         }
     }
 
-    if (getenv("ENABLE_QML_DEBUGGER")) {
-        QQmlDebuggingEnabler qQmlEnableDebuggingHelper(true);
-    }
-
     bindtextdomain("unity8", translationDirectory().toUtf8().data());
     textdomain("unity8");
 

src/main.cpp

@@ -16,6 +16,7 @@
 
 // local
 #include "ShellApplication.h"
+#include "qmldebuggerutils.h"
 
 int main(int argc, const char *argv[])
 {
@@ -25,7 +26,7 @@ int main(int argc, const char *argv[])
         isMirServer = true;
     }
 
-    if (getenv("ENABLE_QML_DEBUGGER")) {
+    if (enableQmlDebugger(argc, argv)) {
         QQmlDebuggingEnabler qQmlEnableDebuggingHelper(true);
     }
 

src/qmldebuggerutils.h

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef QMLDEBUGGERUTILS_H
+#define QMLDEBUGGERUTILS_H
+
+bool enableQmlDebugger(int argc, const char *argv[])
+{
+    for (int i = 1; i < argc; ++i) {
+        QByteArray arg = argv[i];
+        if (arg.startsWith("--"))
+            arg.remove(0, 1);
+        if (arg.startsWith("-qmljsdebugger=") || (arg == "-qmljsdebugger" && i < argc - 1)) {
+            return true;
+        }
+    }
+    return false;
+}
+
+#endif