summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprojectmanager
diff options
context:
space:
mode:
authorck <qt-info@nokia.com>2010-07-28 12:47:55 +0200
committerck <qt-info@nokia.com>2010-07-28 12:48:37 +0200
commitb76cf034dea05a362beb3366760f77a38dcb541f (patch)
tree082453afab7023afd0c7551b600fadb53fcc1de6 /src/plugins/qmlprojectmanager
parent60f68080ffba37b908f99e2266b61b388aa70838 (diff)
downloadqt-creator-b76cf034dea05a362beb3366760f77a38dcb541f.tar.gz
Add Maemo support to QML standalone application wizard.
Reviewed-by: Alessandro Portale
Diffstat (limited to 'src/plugins/qmlprojectmanager')
-rw-r--r--src/plugins/qmlprojectmanager/wizards/templates/app.pro9
-rw-r--r--src/plugins/qmlprojectmanager/wizards/templates/cpp/main.cpp2
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 756f2865d3..697c5b0587 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 092cedb9ee..9e0f56038a 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();