From: Kate Alhola <kate.alhole@gmail.com>
Date: Thu, 26 Apr 2012 10:44:08 +0000 (+0300)
Subject: sync
X-Git-Url: https://vcs.maemo.org/git/?p=mardrone;a=commitdiff_plain;h=4b5b11da4cea3df6d7c37e6d1fed6bba54136c03

sync
---

diff --git a/mardrone/deploy.pri b/mardrone/deploy.pri
index 66d24bd..94d1b20 100644
--- a/mardrone/deploy.pri
+++ b/mardrone/deploy.pri
@@ -5,6 +5,8 @@
 # may offer an updated version of it.
 
 defineTest(qtcAddDeployment) {
+message("qtcAddDeployment()")
+message($$DEPLOYMENTFOLDERS)
 for(deploymentfolder, DEPLOYMENTFOLDERS) {
     item = item$${deploymentfolder}
     itemsources = $${item}.sources
diff --git a/mardrone/main.cpp b/mardrone/main.cpp
index 0e28721..13356b1 100644
--- a/mardrone/main.cpp
+++ b/mardrone/main.cpp
@@ -72,8 +72,8 @@ int main(int argc, char *argv[])
 #ifdef QT_IOS
     QString activeUi=mardroneSettings->value("activeUI","ardrone_plainqml.qml").toString();
 #else
- //   QString activeUi=mardroneSettings->value("activeUI","ardrone_harmattan.qml").toString();
-    QString activeUi=mardroneSettings->value("activeUI","ardrone_desktop.qml").toString();
+    QString activeUi=mardroneSettings->value("activeUI","ardrone_harmattan.qml").toString();
+//    QString activeUi=mardroneSettings->value("activeUI","ardrone_desktop.qml").toString();
 #endif
     qDebug() << "activeUI=" << activeUi;
     QString qmlmainfile=app.arguments().size()>=2 ? app.arguments()[1]:"";
@@ -90,6 +90,10 @@ int main(int argc, char *argv[])
     window.engine()->addImportPath("qrc:");
     window.engine()->addImportPath("gauges");
     window.engine()->addImportPath(".");
+#ifdef Q_OS_ANDROID
+    window.engine()->addImportPath("/imports/");
+    window.engine()->addPluginPath(QDir::homePath()+"/../lib");
+#endif
     qDebug() << "ImportPathList" << window.engine()->importPathList() ;
     QStringList importPath=window.engine()->importPathList();
     window.rootContext()->setContextProperty("uiList",&uiList);