Merge branch '2.2'

Conflicts:
	qtcreator.pri
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
	src/libs/qmljs/qmljsdocument.cpp
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/libs/qmljs/qmljslink.cpp
	src/plugins/cppeditor/cppquickfixes.cpp
	src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp
	src/plugins/qmldesigner/qmldesigner.pro
	src/plugins/qmldesigner/symbianplugin/symbian.metainfo
	src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h

Change-Id: Id5f754e2837a3bb3e0687ed09f1dda45fd0c5617

1 files changed, 23 insertions, 1 deletions

diff --git a/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
index d4d6204c7b..6b93c7e81e 100644
--- a/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
@@ -50,6 +50,7 @@
 #include <QGraphicsObject>
 
 #include <QTextDocument>
+#include <QLibraryInfo>
 
 #include <private/qdeclarativebinding_p.h>
 #include <private/qdeclarativemetatype_p.h>
@@ -768,10 +769,31 @@ QObject *ObjectNodeInstance::createComponentWrap(const QString &nodeSource, cons
     return object;
 }
 
+//The component might also be shipped with Creator.
+//To avoid trouble with import "." we use the component shipped with Creator.
+static inline QString fixComponentPathForIncompatibleQt(const QString &componentPath)
+{
+    QString result = componentPath;
+    const QLatin1String importString("import");
+
+    if (componentPath.contains(importString)) {
+        int index = componentPath.indexOf(importString) + 7;
+        const QString relativeImportPath = componentPath.right(componentPath.length() - index);
+        QString fixedComponentPath = QLibraryInfo::location(QLibraryInfo::ImportsPath) + relativeImportPath;
+        fixedComponentPath.replace(QLatin1Char('\\'), QLatin1Char('/'));
+        if (QFileInfo(fixedComponentPath).exists())
+            return fixedComponentPath;
+    }
+
+    return result;
+
+}
+
 QObject *ObjectNodeInstance::createComponent(const QString &componentPath, QDeclarativeContext *context)
 {    
-    QDeclarativeComponent component(context->engine(), QUrl::fromLocalFile(componentPath));
+    QDeclarativeComponent component(context->engine(), QUrl::fromLocalFile(fixComponentPathForIncompatibleQt(componentPath)));
     QObject *object = component.beginCreate(context);
+
     tweakObjects(object);
     component.completeCreate();