33 Commits

Author SHA1 Message Date
Arttu Tarkiainen
c7066c9dc2 Update usage of Apple-related terminology
Replace deprecated Q_OS_OSX macro used in several places with the newer
Q_OS_MACOS. Old style reference of Apple's desktop operating system name
as "OS X" in documentation and files are also replaced with "macOS"
where applicable.

Task-number: QTIFW-1406
Change-Id: I0561d5e0d964917ac4fca0702d58a06b85d30e57
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-08-16 08:35:19 +00:00
Katja Marttila
9772474dd9 Merge remote-tracking branch 'origin/2.0'
Conflicts:
	Changelog
	dist/config/config.xml
	dist/packages/org.qtproject.ifw.binaries/meta/package.xml
	dist/packages/org.qtproject.ifw/meta/package.xml
	installerfw.pri
	src/libs/installer/lib7z_create.h
	src/libs/kdtools/kdgenericfactory.cpp
	src/libs/kdtools/kdgenericfactory.h
	src/libs/kdtools/kdupdaterapplication.cpp
	src/libs/kdtools/kdupdaterapplication.h
	src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp
	src/libs/kdtools/kdupdaterupdatesourcesinfo.h
	src/libs/kdtools/localpackagehub.cpp
	src/libs/kdtools/localpackagehub.h
	src/libs/kdtools/updatefinder.cpp
	src/libs/kdtools/updatefinder.h
	tools/binarycreator/resources/mkdmg.sh

Change-Id: Iab2513f549832d2e750e77131c673457ab265af4
2017-01-30 14:40:26 +02:00
Katja Marttila
c9d11cc991 License header update to GPL-EXCEPT
Change-Id: I6426c4e8f932cf26c6c638dec18d0c12e22972d1
Reviewed-by: Janne Anttila <janne.anttila@theqtcompany.com>
2017-01-26 10:02:56 +00:00
Takayuki ORITO
b696784760 Add the Predefined Variables in Component Scripting.
Add variables
 - ApplicationsDirX86
 - ApplicationsDirX64

Change that the application directory can be selected on Windows, don't depend on the architecture(32bit or 64bit) of QtIFW.

For example:
When on Windows(64bit version).
 - QtIFW(32bit version)
    - ApplicationsDir -> C:\Program Files (x86)
    - ApplicationsDirX86 -> C:\Program Files (x86)
    - ApplicationsDirX64 -> C:\Program Files
 - QtIFW(64bit version)
    - ApplicationsDir -> C:\Program Files
    - ApplicationsDirX86 -> C:\Program Files (x86)
    - ApplicationsDirX64 -> C:\Program Files

Change-Id: Idbc41d6f1ba9d7b0b9a9ff5590d05077662345cb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Niels Weber <niels.weber@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com>
2016-05-03 07:57:25 +00:00
Iikka Eklund
2af57eb8c8 Merge remote-tracking branch 'origin/2.0'
Conflicts:
	installerfw.pri
	src/libs/kdtools/kdgenericfactory.cpp
	src/libs/kdtools/kdgenericfactory.h
	src/libs/kdtools/kdupdaterapplication.cpp
	src/libs/kdtools/kdupdaterapplication.h
	src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp
	src/libs/kdtools/kdupdaterupdatesourcesinfo.h
	sync.profile

Change-Id: Ifdc8b065f89b7e241bd3788ed79768e21888161f
2016-01-20 14:18:30 +02:00
Iikka Eklund
6ba58b42ab Update license headers
Update existing license headers. LGPL -> LGPLv21.
Update copyright year as well.

Change-Id: Ie1d71f8c68186b8f625f409ddf94691f178093c9
Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-12-29 07:31:11 +00:00
Karsten Heimrich
cab3405ad2 Missed to rename classes and to update docs and tests.
Change-Id: I2d79ab4094cb9706287d44160543c19b35a66c95
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-09-07 10:41:45 +00:00
Kai Koehne
3557b1650c Doc: Clarify use of addOperation
Make it explicit that addOperation , addElevatedOperation should be
usually called from within createOperations().

Change-Id: Id14339b1259716825a9443cc563449025674976f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-05-29 12:16:21 +00:00
Kai Koehne
99996591e0 Update Copyright
Change-Id: I8dde6629cfd461104364d5cdc255cb54b58283fa
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-02-18 10:33:48 +00:00
Leena Miettinen
2bc2b35f67 Doc: fix broken links
To get rid of some QDoc error messages.

Also remove the \c command to enable automatic
linking to scripting API and C++ classes.

Change-Id: I317301bd0097059faf6e7696707fc1f0e3ed0beb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-01-21 15:46:07 +01:00
Kai Koehne
9547c3ff71 Mark "os" variable as deprecated
Mark installer.variable("os") as deprecated, and replace it with
systemInfo.productType in the examples.

Change-Id: Ic86af21369cd066fc003b268f001101b642f6d2d
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-01-20 11:25:58 +01:00
kh1
98c4b02da6 Update Controller documentation and dependent code.
Change-Id: I6f6fb88644722a6acf0d168cc481e854ff188b11
Reviewed-by: Niels Weber <niels.weber@digia.com>
2014-11-12 16:02:46 +01:00
Leena Miettinen
990d17f1fe Doc: replace \a with \c in .qdoc files
The \a command should only be used in code documentation
(in .cpp files), where QDoc uses it to check that all
formal parameters are documented and emits warnings if
they are not or if they are misspelled.

Change-Id: I37710afcd860f9baa3042337aca98fac6701b997
Reviewed-by: Niels Weber <niels.weber@digia.com>
2014-07-02 12:56:24 +02:00
Leena Miettinen
5cee5c92a6 Doc: update copyright year to 2014 in doc files
Change-Id: I72e840dfb737f8e96edf09e2dce74b29c255c326
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-07-01 16:45:48 +02:00
Leena Miettinen
bc8ec51be7 Doc: fixed links to QMessageBox documentation
In Qt 5, you have to specify the index files for
the Qt 5 modules that you want to link to for QDoc
to find them. If you add the brackets in the end of
the method name, QDoc creates the links automatically
and you do not need the \l command.

Change-Id: Ia3dd78bb17e9c176747d406216930295c9fa02a8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-06-17 16:08:05 +02:00
Leena Miettinen
b471703b69 Doc: fixed a broken table
Each row in a table must have the same amount of
\li commands, or the table formatting breaks.
Use line breaks and empty lines if you want to
add several text paragraphs to a table cell.

Change-Id: I7a19bc883c0de18c247ca6c550dd37dba64c89d5
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-17 16:07:08 +02:00
Leena Miettinen
fca941d00a Doc: replace "Max OS X" with "OS X"
According to Apple naming conventions.

Change-Id: I4e7e5334987543118ae18d8547f58d01260f2493
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-17 13:37:06 +02:00
Leena Miettinen
8bc8eaf45a Doc: replace \o with \li
The \o QDoc command has been deprecated in QDoc for
Qt 5 and using it prints a QDoc warning.

Change-Id: Ibf0be59f3953bd731c2133cee3ec399e51df84a5
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-06-17 12:50:09 +02:00
kh1
b3112e6168 Initialize {All}UserStartMenuDir and DesktopDir earlier.
Task-number: QTIFW-346

Change-Id: I641d6c2eb6b74f674b61ccf335885d4577dfcfe4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-04-24 15:37:15 +02:00
kh1
49f376019e Make the installer binary paths available for scripts.
Task-number: QTIFW-424

Change-Id: I36e22323cac9991982f3f85481700c75371eab3a
Reviewed-by: Niels Weber <niels.weber@digia.com>
2014-04-09 11:01:12 +02:00
Niels Weber
aa9d0b6cbe Document the existence of addElevatedOperation.
Task-number: QTIFW-407

Change-Id: I885cc8432ceffae48e94f165f415baa0e54155c2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-11-22 12:27:15 +01:00
kh1
f9615e83f1 Introduce ApplicationsDir variable.
Task-number: QTIFW-258

Change-Id: Ie08884c01c62e40104dce0dba8ef85c5194d7207
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-11-06 16:02:51 +01:00
Niels Weber
f25b8994ea Documented two more predefined variables.
Also allow uppercase variable names and document those.
Also update the config.xml files in the examples to uppercase.

Task-number: QTIFW-257

Change-Id: I446ed4e537cb7c15f49ba3071a9ab6591aab3329
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-08-12 11:56:13 +02:00
Kai Koehne
20fc67fdf1 Add documentation for JS API
Change-Id: Ifef70bf0ef12b90972186f64ff9b0ae602f14420
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-04-23 16:33:47 +02:00
Leena Miettinen
3a08a5f593 Doc: add information about scripting and operations
Change-Id: Ic605dad7c3cd4c29034afaab186c88d08d9c4ec1
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-02-28 13:23:33 +01:00
Kai Koehne
5df05c0a9c Doc: Fix documentation on predefined variables
Change-Id: I805a07f007cddb9fe62db986968f9f79511ffe1f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-02-28 10:19:06 +01:00
Sergio Ahumada
8f4053db30 Change copyright headers from Nokia to Digia
Change-Id: Id55a71a6ee24b234739b6066e11e9c1f2e389f73
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2012-12-21 22:25:29 +01:00
Leena Miettinen
b21c03e7b4 Doc: restructure and add information.
Overview, getting started, use cases.

Add screen shots.

Edit all files.

Change-Id: I0437e179a9ea0d59dd132f1560d7b6315ee67498
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
2012-02-15 12:31:20 +01:00
Tim Jenssen
acd000cc42 added possible operations to an extra page
- maybe this way it is easier to add more operation documenation

Change-Id: I2555f855a9519fd2c02ca014b195bca79345e138
Reviewed-on: http://codereview.qt-project.org/4420
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
2011-09-08 13:40:36 +02:00
Tim Jenssen
4cd5eeee9e added new registerqtv2operation 2011-05-06 11:26:53 +02:00
Tim Jenssen
210e7936b0 Revert "added new registerqtv2operation"
This reverts commit 10fe04128a5d848b22764989b4a0744d69efd903.
2011-05-06 11:21:06 +02:00
Tim Jenssen
10fe04128a added new registerqtv2operation 2011-05-06 11:19:20 +02:00
Tim Jenssen
8457830abd init commit 2011-02-21 16:41:32 +01:00