From b76cf034dea05a362beb3366760f77a38dcb541f Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Wed, 28 Jul 2010 12:47:55 +0200
Subject: [PATCH] Add Maemo support to QML standalone application wizard.
Reviewed-by: Alessandro Portale
---
src/plugins/qmlprojectmanager/wizards/templates/app.pro | 9 ++++++---
.../qmlprojectmanager/wizards/templates/cpp/main.cpp | 2 ++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qmlprojectmanager/wizards/templates/app.pro b/src/plugins/qmlprojectmanager/wizards/templates/app.pro
index 756f2865d39..697c5b0587b 100644
--- a/src/plugins/qmlprojectmanager/wizards/templates/app.pro
+++ b/src/plugins/qmlprojectmanager/wizards/templates/app.pro
@@ -45,14 +45,17 @@ symbian {
first.depends = $(first) copyqmlfiles
QMAKE_EXTRA_TARGETS += first copyqmlfiles
}
-} else {
- # TODO: make this work
+} else:if(maemo5|maemo6) {
for(deploymentfolder, DEPLOYMENTFOLDERS) {
item = item$${deploymentfolder}
itemfiles = $${item}.files
$$itemfiles = $${deploymentfolder}
itempath = $${item}.path
- $$itempath = qml
+ $$itempath = /opt/share/qml
INSTALLS += $$item
}
+ target.path = /opt/bin
+ INSTALLS += target
+} else {
+ # TODO: make this work
}
diff --git a/src/plugins/qmlprojectmanager/wizards/templates/cpp/main.cpp b/src/plugins/qmlprojectmanager/wizards/templates/cpp/main.cpp
index 092cedb9ee0..9e0f56038aa 100644
--- a/src/plugins/qmlprojectmanager/wizards/templates/cpp/main.cpp
+++ b/src/plugins/qmlprojectmanager/wizards/templates/cpp/main.cpp
@@ -13,6 +13,8 @@ int main(int argc, char *argv[])
#ifdef Q_OS_SYMBIAN
qmlApp.showFullScreen();
+#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+ qmlApp.showMaximized();
#else
qmlApp.setGeometry(QRect(100, 100, 360, 640));
qmlApp.show();
--
GitLab