From 88af981ab45958bb8986dbf22502718fad9f6630 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Mon, 16 Aug 2010 20:27:30 +0200
Subject: [PATCH] Fixing order of call to QDeclarativeView

setSource() needs to be called *after* addImportPath.
---
 share/qtcreator/templates/qmlapp/cpp/main.cpp |  3 +-
 .../qmlapp/cpp/qmlapplicationview.cpp         | 28 +++++++++++++------
 .../templates/qmlapp/cpp/qmlapplicationview.h |  3 +-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/share/qtcreator/templates/qmlapp/cpp/main.cpp b/share/qtcreator/templates/qmlapp/cpp/main.cpp
index 56c9e7d232a..c37bbb96ee7 100644
--- a/share/qtcreator/templates/qmlapp/cpp/main.cpp
+++ b/share/qtcreator/templates/qmlapp/cpp/main.cpp
@@ -5,9 +5,10 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    QmlApplicationView qmlApp(QLatin1String("qml/app/app.qml")); // MAINQML
+    QmlApplicationView qmlApp;
     qmlApp.addImportPath(QLatin1String("modules")); // ADDIMPORTPATH
     qmlApp.setOrientation(QmlApplicationView::Auto); // ORIENTATION
+    qmlApp.setMainQml(QLatin1String("qml/app/app.qml")); // MAINQML
     qmlApp.setLoadDummyData(false); // LOADDUMMYDATA
 
 #ifdef Q_OS_SYMBIAN
diff --git a/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.cpp b/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.cpp
index 93d8abb4550..a33b3a95dae 100644
--- a/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.cpp
+++ b/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.cpp
@@ -18,9 +18,20 @@ class QmlApplicationViewPrivate
 {
     QString mainQmlFile;
     friend class QmlApplicationView;
+    static QString adjustPath(const QString &path);
 };
 
-QmlApplicationView::QmlApplicationView(const QString &mainQmlFile, QWidget *parent) :
+QString QmlApplicationViewPrivate::adjustPath(const QString &path)
+{
+#ifdef Q_OS_MAC
+    if (!QDir::isAbsolute(path))
+        return QCoreApplication::applicationDirPath()
+                + QLatin1String("/../Resources/") + path;
+#endif
+    return path;
+}
+
+QmlApplicationView::QmlApplicationView(QWidget *parent) :
 #ifdef QMLINSPECTOR
     QmlViewer::QDeclarativeDesignView(parent)
 #else
@@ -28,13 +39,6 @@ QmlApplicationView::QmlApplicationView(const QString &mainQmlFile, QWidget *pare
 #endif
     , m_d(new QmlApplicationViewPrivate)
 {
-#ifdef Q_OS_MAC
-    m_d->mainQmlFile = QCoreApplication::applicationDirPath()
-            + QLatin1String("/../Resources/") + mainQmlFile;
-#else
-    m_d->mainQmlFile = mainQmlFile;
-#endif
-    setSource(QUrl(m_d->mainQmlFile));
     connect(engine(), SIGNAL(quit()), SLOT(close()));
     setResizeMode(QDeclarativeView::SizeRootObjectToView);
 }
@@ -44,9 +48,15 @@ QmlApplicationView::~QmlApplicationView()
     delete m_d;
 }
 
+void QmlApplicationView::setMainQml(const QString &mainQml)
+{
+    m_d->mainQmlFile = QmlApplicationViewPrivate::adjustPath(mainQml);
+    setSource(QUrl::fromLocalFile(m_d->mainQmlFile));
+}
+
 void QmlApplicationView::addImportPath(const QString &importPath)
 {
-    engine()->addImportPath(importPath);
+    engine()->addImportPath(QmlApplicationViewPrivate::adjustPath(importPath));
 }
 
 void QmlApplicationView::setOrientation(Orientation orientation)
diff --git a/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.h b/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.h
index ae9c5aa71a6..2488a96e145 100644
--- a/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.h
+++ b/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.h
@@ -16,9 +16,10 @@ public:
         Auto
     };
 
-    QmlApplicationView(const QString &mainQmlFile, QWidget *parent = 0);
+    QmlApplicationView(QWidget *parent = 0);
     virtual ~QmlApplicationView();
 
+    void setMainQml(const QString &mainQml);
     void addImportPath(const QString &importPath);
     void setOrientation(Orientation orientation);
     void setLoadDummyData(bool loadDummyData);