summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@digia.com>2014-10-27 14:18:43 +0100
committerKarsten Heimrich <karsten.heimrich@digia.com>2014-10-30 11:30:07 +0100
commitbf84d5675d1a152689485fe4cc8875b8c28d32f4 (patch)
treecfbee967f0caddaa45564e5d8e5ceb07dbe56cb7 /examples
parentfbc423657791f42d30414a765c64cf01c118d422 (diff)
Unify the output name to match the README file description.
Fix the dynamic page example to compile the additional resource. Change-Id: I62a641f05c4ac76649951695ea5c2d03a390ee8d Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/changeuserinterface/changeuserinterface.pro2
-rw-r--r--examples/componenterror/componenterror.pro2
-rw-r--r--examples/dynamicpage/dynamicpage.pro4
-rw-r--r--examples/licenseagreement/licenseagreement.pro2
-rw-r--r--examples/modifyextract/modifyextract.pro2
-rw-r--r--examples/openreadme/openreadme.pro2
-rw-r--r--examples/quit_installer/README2
-rw-r--r--examples/quit_installer/quit_installer.pro2
-rw-r--r--examples/registerfileextension/registerfileextension.pro2
-rw-r--r--examples/startmenu/README2
-rw-r--r--examples/startmenu/startmenu.pro2
11 files changed, 12 insertions, 12 deletions
diff --git a/examples/changeuserinterface/changeuserinterface.pro b/examples/changeuserinterface/changeuserinterface.pro
index de3af2de9..415df49d5 100644
--- a/examples/changeuserinterface/changeuserinterface.pro
+++ b/examples/changeuserinterface/changeuserinterface.pro
@@ -1,6 +1,6 @@
TEMPLATE = aux
-INSTALLER = offline
+INSTALLER = installer
INPUT = $$PWD/config/config.xml $$PWD/packages
example.input = INPUT
diff --git a/examples/componenterror/componenterror.pro b/examples/componenterror/componenterror.pro
index de3af2de9..415df49d5 100644
--- a/examples/componenterror/componenterror.pro
+++ b/examples/componenterror/componenterror.pro
@@ -1,6 +1,6 @@
TEMPLATE = aux
-INSTALLER = offline
+INSTALLER = installer
INPUT = $$PWD/config/config.xml $$PWD/packages
example.input = INPUT
diff --git a/examples/dynamicpage/dynamicpage.pro b/examples/dynamicpage/dynamicpage.pro
index de3af2de9..2ceb93bcb 100644
--- a/examples/dynamicpage/dynamicpage.pro
+++ b/examples/dynamicpage/dynamicpage.pro
@@ -1,11 +1,11 @@
TEMPLATE = aux
-INSTALLER = offline
+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.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -r $$PWD/resources/additional.qrc -p $$PWD/packages ${QMAKE_FILE_OUT}
example.CONFIG += target_predeps no_link combine
QMAKE_EXTRA_COMPILERS += example
diff --git a/examples/licenseagreement/licenseagreement.pro b/examples/licenseagreement/licenseagreement.pro
index de3af2de9..415df49d5 100644
--- a/examples/licenseagreement/licenseagreement.pro
+++ b/examples/licenseagreement/licenseagreement.pro
@@ -1,6 +1,6 @@
TEMPLATE = aux
-INSTALLER = offline
+INSTALLER = installer
INPUT = $$PWD/config/config.xml $$PWD/packages
example.input = INPUT
diff --git a/examples/modifyextract/modifyextract.pro b/examples/modifyextract/modifyextract.pro
index de3af2de9..415df49d5 100644
--- a/examples/modifyextract/modifyextract.pro
+++ b/examples/modifyextract/modifyextract.pro
@@ -1,6 +1,6 @@
TEMPLATE = aux
-INSTALLER = offline
+INSTALLER = installer
INPUT = $$PWD/config/config.xml $$PWD/packages
example.input = INPUT
diff --git a/examples/openreadme/openreadme.pro b/examples/openreadme/openreadme.pro
index de3af2de9..415df49d5 100644
--- a/examples/openreadme/openreadme.pro
+++ b/examples/openreadme/openreadme.pro
@@ -1,6 +1,6 @@
TEMPLATE = aux
-INSTALLER = offline
+INSTALLER = installer
INPUT = $$PWD/config/config.xml $$PWD/packages
example.input = INPUT
diff --git a/examples/quit_installer/README b/examples/quit_installer/README
index 2d6abf7f0..ffcbb4f54 100644
--- a/examples/quit_installer/README
+++ b/examples/quit_installer/README
@@ -2,5 +2,5 @@ Shows how to quit an installer from script side.
Generate installer with
-binarycreator --offline-only -c config/config.xml -p packages ask_to_quit_installer
+binarycreator --offline-only -c config/config.xml -p packages installer
diff --git a/examples/quit_installer/quit_installer.pro b/examples/quit_installer/quit_installer.pro
index de3af2de9..415df49d5 100644
--- a/examples/quit_installer/quit_installer.pro
+++ b/examples/quit_installer/quit_installer.pro
@@ -1,6 +1,6 @@
TEMPLATE = aux
-INSTALLER = offline
+INSTALLER = installer
INPUT = $$PWD/config/config.xml $$PWD/packages
example.input = INPUT
diff --git a/examples/registerfileextension/registerfileextension.pro b/examples/registerfileextension/registerfileextension.pro
index de3af2de9..415df49d5 100644
--- a/examples/registerfileextension/registerfileextension.pro
+++ b/examples/registerfileextension/registerfileextension.pro
@@ -1,6 +1,6 @@
TEMPLATE = aux
-INSTALLER = offline
+INSTALLER = installer
INPUT = $$PWD/config/config.xml $$PWD/packages
example.input = INPUT
diff --git a/examples/startmenu/README b/examples/startmenu/README
index aa0a0268b..537c49b9e 100644
--- a/examples/startmenu/README
+++ b/examples/startmenu/README
@@ -2,5 +2,5 @@ Shows how to add an entry to the Windows start menu.
Generate installer with
-binarycreator --offline-only -c config/config.xml -p packages start_menu_installer
+binarycreator --offline-only -c config/config.xml -p packages installer
diff --git a/examples/startmenu/startmenu.pro b/examples/startmenu/startmenu.pro
index de3af2de9..415df49d5 100644
--- a/examples/startmenu/startmenu.pro
+++ b/examples/startmenu/startmenu.pro
@@ -1,6 +1,6 @@
TEMPLATE = aux
-INSTALLER = offline
+INSTALLER = installer
INPUT = $$PWD/config/config.xml $$PWD/packages
example.input = INPUT