From 855582de9135c8eb50842f39a3ae95b31e00236a Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Wed, 13 Apr 2011 13:00:06 +0200
Subject: [PATCH] QmlProject: Fix import of .qmlproject.user files from 2.1

We changed the semantics of an empty 'mainScript' in the .user file:
In 2.1 it translated to 'use current file', while in 2.2 the default is now
to use the file specified in .qmlproject.

However, if there is no mainFile specified in .qmlproject we should
fall back to the current file in editor.

Reviewed-by: Christiaan Janssen
---
 .../qmlprojectmanager/qmlprojectrunconfiguration.cpp   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index f73a48de521..627ce5d331e 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -248,7 +248,10 @@ QString QmlProjectRunConfiguration::mainScript() const
         return m_mainScriptFilename;
     }
 
-    QString path = qmlTarget()->qmlProject()->mainFile();
+    const QString path = qmlTarget()->qmlProject()->mainFile();
+    if (path.isEmpty()) {
+        return m_currentFileFilename;
+    }
     if (QFileInfo(path).isAbsolute()) {
         return path;
     } else {
@@ -325,8 +328,11 @@ bool QmlProjectRunConfiguration::fromMap(const QVariantMap &map)
     return RunConfiguration::fromMap(map);
 }
 
-void QmlProjectRunConfiguration::changeCurrentFile(Core::IEditor * /*editor*/)
+void QmlProjectRunConfiguration::changeCurrentFile(Core::IEditor *editor)
 {
+    if (editor) {
+        m_currentFileFilename = editor->file()->fileName();
+    }
     updateEnabled();
 }