Merge remote-tracking branch 'origin/3.0' into master

Change-Id: I73cb43e090c6ff34f1ceb774490d01818465e2e0

8 files changed, 55 insertions, 0 deletions

diff --git a/examples/registervirtualcomponentforuninstall/README b/examples/registervirtualcomponentforuninstall/README
new file mode 100644
index 000000000..930efa5ed
--- /dev/null
+++ b/examples/registervirtualcomponentforuninstall/README
@@ -0,0 +1,6 @@
+Shows how to register virtual component to uninstall in component script.
+
+Generate installer with
+
+binarycreator --offline-only -c config/config.xml -p packages installer
+
diff --git a/examples/registervirtualcomponentforuninstall/config/config.xml b/examples/registervirtualcomponentforuninstall/config/config.xml
new file mode 100644
index 000000000..48b5c7438
--- /dev/null
+++ b/examples/registervirtualcomponentforuninstall/config/config.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Installer>
+    <Name>Register Component to Uninstall Example</Name>
+    <Version>1.0.0</Version>
+    <Title>Register Component to Uninstall Example</Title>
+    <Publisher>Qt-Project</Publisher>
+    <StartMenuDir>Qt IFW Examples</StartMenuDir>
+    <TargetDir>@HomeDir@/IfwExamples/registercomponenttouninstall</TargetDir>
+    <ControlScript>controller.qs</ControlScript>
+</Installer>
diff --git a/examples/registervirtualcomponentforuninstall/config/controller.qs b/examples/registervirtualcomponentforuninstall/config/controller.qs
new file mode 100644
index 000000000..ba1e74651
--- /dev/null
+++ b/examples/registervirtualcomponentforuninstall/config/controller.qs
@@ -0,0 +1,9 @@
+function Controller() {
+
+}
+
+Controller.prototype.ComponentSelectionPageCallback = function() {
+
+    var page = gui.pageWidgetByObjectName("ComponentSelectionPage");
+    page.addVirtualComponentToUninstall("component")
+}
diff --git a/examples/registervirtualcomponentforuninstall/packages/component/data/selectedcomponent b/examples/registervirtualcomponentforuninstall/packages/component/data/selectedcomponent
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/examples/registervirtualcomponentforuninstall/packages/component/data/selectedcomponent
diff --git a/examples/registervirtualcomponentforuninstall/packages/component/meta/package.xml b/examples/registervirtualcomponentforuninstall/packages/component/meta/package.xml
new file mode 100644
index 000000000..9e02c2885
--- /dev/null
+++ b/examples/registervirtualcomponentforuninstall/packages/component/meta/package.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package>
+    <DisplayName>Component selected from script</DisplayName>
+    <Description>This component is selected to uninstall in script</Description>
+    <Version>1.0.0-1</Version>
+    <ReleaseDate>2018-02-02</ReleaseDate>
+    <Virtual>true</Virtual>
+</Package>
diff --git a/examples/registervirtualcomponentforuninstall/packages/org.qtproject.ifw.example.registercomponent/data/registercomponent b/examples/registervirtualcomponentforuninstall/packages/org.qtproject.ifw.example.registercomponent/data/registercomponent
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/examples/registervirtualcomponentforuninstall/packages/org.qtproject.ifw.example.registercomponent/data/registercomponent
diff --git a/examples/registervirtualcomponentforuninstall/packages/org.qtproject.ifw.example.registercomponent/meta/package.xml b/examples/registervirtualcomponentforuninstall/packages/org.qtproject.ifw.example.registercomponent/meta/package.xml
new file mode 100644
index 000000000..431ff2441
--- /dev/null
+++ b/examples/registervirtualcomponentforuninstall/packages/org.qtproject.ifw.example.registercomponent/meta/package.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package>
+    <DisplayName>Registers component for install</DisplayName>
+    <Description>Register a component for installation</Description>
+    <Version>1.0.0-1</Version>
+    <ReleaseDate>2013-01-01</ReleaseDate>
+    <Default>true</Default>
+    <Dependencies>component</Dependencies>
+</Package>
diff --git a/examples/registervirtualcomponentforuninstall/registercomponentforinstall.pro b/examples/registervirtualcomponentforuninstall/registercomponentforinstall.pro
new file mode 100644
index 000000000..415df49d5
--- /dev/null
+++ b/examples/registervirtualcomponentforuninstall/registercomponentforinstall.pro
@@ -0,0 +1,13 @@
+TEMPLATE = aux
+
+INSTALLER = installer
+
+INPUT = $$PWD/config/config.xml $$PWD/packages
+example.input = INPUT
+example.output = $$INSTALLER
+example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT}
+example.CONFIG += target_predeps no_link combine
+
+QMAKE_EXTRA_COMPILERS += example
+
+OTHER_FILES = README