QmlDebugger: Attach to QML Port: Fix errors

Connect to user defined host and port. Increased maximum connection tries.

Change-Id: Ie72a9fb36e5178b64311753bd8a3fe20e6f62c3b
Reviewed-on: http://codereview.qt-project.org/4918
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

1 files changed, 6 insertions, 12 deletions

diff --git a/src/plugins/qmljsinspector/qmljsinspector.cpp b/src/plugins/qmljsinspector/qmljsinspector.cpp
index d45bf6a782..2fd9f2c24c 100644
--- a/src/plugins/qmljsinspector/qmljsinspector.cpp
+++ b/src/plugins/qmljsinspector/qmljsinspector.cpp
@@ -152,7 +152,6 @@ InspectorUi::InspectorUi(QObject *parent)
     , m_clientProxy(0)
     , m_qmlEngine(0)
     , m_debugQuery(0)
-    , m_debugProject(0)
     , m_selectionCallbackExpected(false)
     , m_cursorPositionChangedExternally(false)
 {
@@ -310,11 +309,12 @@ void InspectorUi::connected(ClientProxy *clientProxy)
         it.value()->resetInitialDoc(doc);
     }
 
-    m_debugProject = ProjectExplorer::ProjectExplorerPlugin::instance()->startupProject();
-
-    connect(m_debugProject, SIGNAL(destroyed()), SLOT(currentDebugProjectRemoved()));
-    m_projectFinder.setProjectDirectory(m_debugProject->projectDirectory());
-    m_projectFinder.setProjectFiles(m_debugProject->files(ProjectExplorer::Project::AllFiles));
+    // project is needed for matching filenames, esp. with shadow builds.
+    ProjectExplorer::Project *debugProject = ProjectExplorer::ProjectExplorerPlugin::instance()->startupProject();
+    if (debugProject) {
+        m_projectFinder.setProjectDirectory(debugProject->projectDirectory());
+        m_projectFinder.setProjectFiles(debugProject->files(ProjectExplorer::Project::AllFiles));
+    }
 
     connectSignals();
     enable();
@@ -335,7 +335,6 @@ void InspectorUi::disconnected()
     disconnectSignals();
     disable();
 
-    m_debugProject = 0;
     m_qmlEngine = 0;
     resetViews();
 
@@ -489,11 +488,6 @@ QmlJSLiveTextPreview *InspectorUi::createPreviewForEditor(Core::IEditor *newEdit
     return preview;
 }
 
-void InspectorUi::currentDebugProjectRemoved()
-{
-    m_debugProject = 0;
-}
-
 void InspectorUi::resetViews()
 {
     m_propertyInspector->clear();