summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@theqtcompany.com>2015-02-26 11:24:04 +0100
committerKarsten Heimrich <karsten.heimrich@theqtcompany.com>2015-03-02 11:19:33 +0000
commit96aa59558d651b9b74d9b6c2f8292d9b838c2e34 (patch)
tree3c132ead216f6ecbc357ecfc38989a26de489de7 /examples
parent986bb1d89785ad52d791db51199aa31b465521a3 (diff)
Drop underscore in quit_installer example
Change-Id: I06291cf5ec09e5281f4a9554bb4145a2974042a1 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/doc/images/qtifw-examples-quitinstaller.png (renamed from examples/doc/images/qtifw-examples-quit_installer.png)bin19682 -> 19682 bytes
-rw-r--r--examples/doc/quitinstaller.qdoc (renamed from examples/doc/quit_installer.qdoc)10
-rw-r--r--examples/examples.pro2
-rw-r--r--examples/quitinstaller/README (renamed from examples/quit_installer/README)0
-rw-r--r--examples/quitinstaller/config/config.xml (renamed from examples/quit_installer/config/config.xml)0
-rw-r--r--examples/quitinstaller/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js (renamed from examples/quit_installer/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js)0
-rw-r--r--examples/quitinstaller/packages/org.qtproject.ifw.example.quitinstaller/meta/package.xml (renamed from examples/quit_installer/packages/org.qtproject.ifw.example.quitinstaller/meta/package.xml)0
-rw-r--r--examples/quitinstaller/quitinstaller.pro (renamed from examples/quit_installer/quit_installer.pro)0
8 files changed, 6 insertions, 6 deletions
diff --git a/examples/doc/images/qtifw-examples-quit_installer.png b/examples/doc/images/qtifw-examples-quitinstaller.png
index 12e94f0a1..12e94f0a1 100644
--- a/examples/doc/images/qtifw-examples-quit_installer.png
+++ b/examples/doc/images/qtifw-examples-quitinstaller.png
Binary files differ
diff --git a/examples/doc/quit_installer.qdoc b/examples/doc/quitinstaller.qdoc
index e4d23e671..aa8590499 100644
--- a/examples/doc/quit_installer.qdoc
+++ b/examples/doc/quitinstaller.qdoc
@@ -26,11 +26,11 @@
****************************************************************************/
/*!
- \example quit_installer
+ \example quitinstaller
\ingroup qtifwexamples
\title Quit Installer Example
- \image qtifw-examples-quit_installer.png
+ \image qtifw-examples-quitinstaller.png
\brief Using a component script to quit an installer.
@@ -40,7 +40,7 @@
\include installerfw-examples-configuring.qdocinc
- \quotefile quit_installer/config/config.xml
+ \quotefile quitinstaller/config/config.xml
\include installerfw-examples-packaging.qdocinc
@@ -51,14 +51,14 @@
file that is loaded to perform operations.
\endlist
- \quotefile quit_installer/packages/org.qtproject.ifw.example.quitinstaller/meta/package.xml
+ \quotefile quitinstaller/packages/org.qtproject.ifw.example.quitinstaller/meta/package.xml
\section1 Quitting the Installation
In installscript.js, we use the \c Component() function to display a
message box for quitting the installer to end users:
- \quotefromfile quit_installer/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js
+ \quotefromfile quitinstaller/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js
\skipto Component()
\printuntil QMessageBox.Ok
diff --git a/examples/examples.pro b/examples/examples.pro
index 75cb2e20b..92a976ff2 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -9,7 +9,7 @@ SUBDIRS += \
modifyextract \
online \
openreadme \
- quit_installer \
+ quitinstaller \
registerfileextension \
startmenu \
systeminfo
diff --git a/examples/quit_installer/README b/examples/quitinstaller/README
index ffcbb4f54..ffcbb4f54 100644
--- a/examples/quit_installer/README
+++ b/examples/quitinstaller/README
diff --git a/examples/quit_installer/config/config.xml b/examples/quitinstaller/config/config.xml
index 910757b58..910757b58 100644
--- a/examples/quit_installer/config/config.xml
+++ b/examples/quitinstaller/config/config.xml
diff --git a/examples/quit_installer/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js b/examples/quitinstaller/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js
index 463554675..463554675 100644
--- a/examples/quit_installer/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js
+++ b/examples/quitinstaller/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js
diff --git a/examples/quit_installer/packages/org.qtproject.ifw.example.quitinstaller/meta/package.xml b/examples/quitinstaller/packages/org.qtproject.ifw.example.quitinstaller/meta/package.xml
index 9362e7341..9362e7341 100644
--- a/examples/quit_installer/packages/org.qtproject.ifw.example.quitinstaller/meta/package.xml
+++ b/examples/quitinstaller/packages/org.qtproject.ifw.example.quitinstaller/meta/package.xml
diff --git a/examples/quit_installer/quit_installer.pro b/examples/quitinstaller/quitinstaller.pro
index 415df49d5..415df49d5 100644
--- a/examples/quit_installer/quit_installer.pro
+++ b/examples/quitinstaller/quitinstaller.pro