From d6aa31a1fb99232b91301f9b57f0829cbb1e6ef4 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Thu, 10 Feb 2011 15:16:55 +0100
Subject: [PATCH] QML extension plugin wizard: Make deployable on Maemo.

Task-number: QTCREATORBUG-3229
Reviewed-by: Alessandro Portale
---
 .../templates/wizards/qml-extension/project.pro       | 11 +++++++++++
 .../templates/wizards/qml-extension/wizard.xml        |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/share/qtcreator/templates/wizards/qml-extension/project.pro b/share/qtcreator/templates/wizards/qml-extension/project.pro
index 94686cebcab..1e98bd7a765 100644
--- a/share/qtcreator/templates/wizards/qml-extension/project.pro
+++ b/share/qtcreator/templates/wizards/qml-extension/project.pro
@@ -4,6 +4,7 @@ QT += declarative
 CONFIG += qt plugin
 
 TARGET = $$qtLibraryTarget($$TARGET)
+uri = %Uri%
 
 # Input
 SOURCES += \
@@ -23,3 +24,13 @@ OTHER_FILES = qmldir
     QMAKE_EXTRA_TARGETS += copy_qmldir
     PRE_TARGETDEPS += $$copy_qmldir.target
 }
+
+qmldir.files = qmldir
+symbian {
+    # ...
+} else:unix {
+    installPath = /usr/lib/qt4/imports/$$replace(uri, \., /)
+    qmldir.path = $$installPath
+    target.path = $$installPath
+    INSTALLS += target qmldir
+}
diff --git a/share/qtcreator/templates/wizards/qml-extension/wizard.xml b/share/qtcreator/templates/wizards/qml-extension/wizard.xml
index d5239ec5842..307b2fdc49b 100644
--- a/share/qtcreator/templates/wizards/qml-extension/wizard.xml
+++ b/share/qtcreator/templates/wizards/qml-extension/wizard.xml
@@ -60,6 +60,10 @@ leave room for the Qt 4 target page.
             <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9_]+$'  defaulttext="MyItem"/>
             <fielddescription>Object Class-name:</fielddescription>
         </field>
+        <field mandatory="false" name="Uri">
+            <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9]+([A-Za-z0-9-]*[A-Za-z0-9]+)?(\.[A-Za-z0-9]+([-A-Za-z0-9]*[A-Za-z0-9]+)?)*$' defaulttext="com.mycompany.qmlcomponents"/>
+            <fielddescription>URI:</fielddescription>
+        </field>
     </fields>
     <validationrules>
         <validationrule condition='"%ObjectName%" != "%ProjectName%_plugin"'>