summaryrefslogtreecommitdiffstats
path: root/installerfw.pri
Commit message (Collapse)AuthorAgeFilesLines
* Update IFW version numberKatja Marttila2021-03-091-3/+3
| | | | | Change-Id: I1a85fb972ed3d112ee8373320229a3015991d6c7 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Tools: refactor to move general purpose functionality to installer libArttu Tarkiainen2020-12-021-0/+1
| | | | | | | | | This makes it possible to utilize parts of our existing tooling in the offline installer from online installer generation process. Task-number: QTIFW-2048 Change-Id: I7ee605be75541cc83a3b6909089bda45f0835bcf Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Update IFW version numberKatja Marttila2020-11-101-3/+3
| | | | | Change-Id: Ia170c00fcd6dd585a2e91bdc0e266dc05de90d8d Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Allow disabling translation features with environment variableArttu Tarkiainen2020-08-261-0/+5
| | | | | | | | | | 'IFW_DISABLE_TRANSLATIONS' can be used to disable translation features with a value of '1', '0' or any other values are ignored. The variable is evaluated at the time of running qmake. Task-number: QTIFW-1911 Change-Id: I99c472eae4229b8add109fcf7f764f670909231d Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Answer queries from command lineKatja Marttila2020-04-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | Standard input is possible in Windows only in console application. This change makes installers to be console applications by default. If started as gui from command line, console is released and application is restarted so cmd.exe won't be waiting for application to finish. If started from explorer, console is launched but released immediately. This may be seen on screen with short console flash. Using command line interface messagebox strings and possible answer values for it are printed to console. Answers must be given in case sensitive format as StandardButton QMetaEnum is utilized when reading button values. This ensures that if StandardButtons are added/removed/changed the code continues to work. Also added a new option 'default-answer' which will answer the questions with default button values without user interaction. Task-number: QTIFW-1739 Change-Id: I710f921f5c927dbd13090af32f93656dded84e72 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Allow setting IFW_LIB_PATH with qmakeSimo Fält2020-04-161-1/+3
| | | | | | | | | Now we can pass the lib location with qmake and use the default only if not set. Change-Id: I17e370015d7edbc687f8313fcf480baca74ab8c2 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Update IFW version numberKatja Marttila2019-12-161-3/+3
| | | | | | | | | Also make the predefined variable IFW_VERSION_STR available from xml and qs with @IFW_VERSION_STR@. IFW_VERSION_STR contains the installer framework version and can be set from installerfw.pri. Change-Id: Ifb232d7891b725c9d0d2ba18e691f7e818923432 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Merge remote-tracking branch 'origin/3.1' into masterKatja Marttila2019-08-231-1/+7
|\ | | | | | | Change-Id: I8b203e12283374aed707e0e89c2f73d44ff296cb
| * Add IFW version information to installerbase binary on WindowsArttu Tarkiainen2019-08-151-1/+7
| | | | | | | | | | | | | | | | | | | | | | Add Windows VERSIONINFO resource definition to installerbase.rc so we can link the installerbase executable with file version property. Created installers using this base binary will include the set version property. Task-number: QTIFW-1397 Change-Id: Ie7781bf65c6032c01bb0bac9e945c665e81973d9 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Prepare 3.1.2 release3.1.2-rcKatja Marttila2019-06-181-2/+2
| | | | | | | | | | Change-Id: I3e0c2cb9825974ec42940c55d8d9b48afa770d8e Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Merge remote-tracking branch 'origin/3.1' into masterKatja Marttila2019-05-271-2/+2
|\ \ | |/ | | | | Change-Id: I65e3ed3858cda954a5f916031d4ff02a39a9aa87
| * Prepare 3.1.1 releaseKatja Marttila2019-05-021-2/+2
|/ | | | | Change-Id: I4aae0b0a95cfdb94c608001b3d636cf2c535c4f6 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Prepare 3.1 releaseKatja Marttila2019-01-041-2/+2
| | | | | Change-Id: I544869f1fe344ca076e23dc7809dc14aecf6ea3d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/3.0'Katja Marttila2017-09-251-9/+7
|\ | | | | | | Change-Id: Id2e682dc2698e08f91bee83e2a94de57403545a0
| * Always build libinstaller as a static libraryJake Petroules2017-09-131-9/+7
| | | | | | | | | | | | | | | | | | This fixes the build if IFW is built with a dynamically linked Qt, and does not otherwise affect use of static builds of Qt. Task-number: QTIFW-993 Change-Id: I1e6807e522adde339263c697fa4a1353250a2e3f Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Prepare 3.0.1 releaseKatja Marttila2017-06-261-2/+2
| | | | | | | | | | Change-Id: I799de5aa50040aea159d9f13209e73d19ffed9d7 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Merge remote-tracking branch 'origin/3.0' into masterKatja Marttila2017-05-241-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: dist/config/config.xml dist/packages/org.qtproject.ifw.binaries/meta/package.xml dist/packages/org.qtproject.ifw/meta/package.xml installerfw.pri Change-Id: Ifaac76cd06737167a908baba5e554bedddd0e5ae
| * Fix ld warnings in macOSKatja Marttila2017-05-231-0/+1
| | | | | | | | | | Change-Id: I6f5b98bdd2a5997f6549219393570d6db09bbad0 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * Prepare 3.0.0 releaseKatja Marttila2017-05-151-2/+2
| | | | | | | | | | Change-Id: I6e7c58bd9ad958a65729b6b8cd55f2958fe92aed Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Begin 3.1 version developmentKonstantin Podsvirov2017-04-111-2/+2
|/ | | | | Change-Id: Idd6e89a09a539eb9d6d6b1271738bd8ba774cce6 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Bump major version number to 3Konstantin Podsvirov2017-03-301-2/+2
| | | | | Change-Id: If4cf94a34fd6ac22bed94fe8bb508c429ef82fe3 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* add NOMINMAX to fix compile with Qt5.7 in WindowsKatja Marttila2016-05-201-2/+3
| | | | | | Task-number: QTIFW-854 Change-Id: I73cb2a40d59803050c1b8f729e22a4caebcab724 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Fix building with ICC on WindowsKatja Marttila2016-05-031-1/+1
| | | | | | | Task-number: QTIFW-851 Change-Id: Ic92e24cc2d5046aca3ec81843c00aa3c52288a4d Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* Merge remote-tracking branch 'origin/2.0'Iikka Eklund2016-01-201-1/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Add alternative option where to read the installer-framework sha1Iikka Eklund2016-01-041-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "--version" uses the sha1 of the git checkout of the installer-framework. This works when making the build from git checkout. For Coin (continuous integration) the installer-framework builds are made from stored src packages where the .git directory is not present. In this case read the sha1 from the .tag instead which is present in the Coin produced src packages. Change-Id: Ic6387c844699f4410c043a4df84727bb5c1108ae Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Version bumpKai Koehne2015-06-161-2/+2
| | | | | | | | | | | | Change-Id: Ic11a894ef21f4dd2967a3fd662fad8a30f11ba7e Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * Bump version numberKai Koehne2015-04-081-2/+2
| | | | | | | | | | | | Change-Id: I78552ac9b88fd02828966e71ddafd25a3075535e Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Don't mix iterator and const_iteratorKai Koehne2015-04-081-1/+1
| | | | | | | | | | | | | | | | | | Add QT_STRICT_ITERATORS to disallow implicit conversions between iterator and const_iterator. This avoids potential detaches of the Qt containers. Change-Id: I79d381f531ddda9ac402c6f5c63cdc7c6808a0bd Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* | Merge remote-tracking branch 'origin/2.0'Kai Koehne2015-01-211-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: dist/config/config.xml dist/packages/org.qtproject.ifw.binaries/meta/package.xml dist/packages/org.qtproject.ifw/meta/package.xml installerfw.pri Change-Id: Ia5dd8dfbaa2289f1b167191d6997a5f4340721a2
| * Bump version numberKai Koehne2015-01-191-2/+2
| | | | | | | | | | Change-Id: I0d6afa57054d012cd23e6364a32ca2485741a784 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Bump version numberKai Koehne2014-12-101-1/+1
|/ | | | | Change-Id: I84bb6a1f7c2a6e882657f7c0473211b94997ace8 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Allow to check for IFW version in codeKai Koehne2014-11-111-2/+4
| | | | | | | | | | Rename the IFW_VERSION to IFW_VERSION_STR, and add a new IFW_VERSION define that encodes the version in hex. This follows the pattern of QT_VERSION and QT_VERSION_STR, and allows easy checking of the IFW version e.g. in macros. Change-Id: I232c8aa53c9a04522810208cdd1ac595d8676879 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* Implement progress indicator on taskbar on Windows.kh12014-09-111-0/+1
| | | | | | | Task-number: QTIFW-15 Change-Id: Ia11c185f25dff2f1614425ec5ff78e79b2fa2a77 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Enable QStringBuilderKai Koehne2014-06-191-1/+1
| | | | | | | QStringBuilder improves the speed of string concatenation a lot ... Change-Id: I9dedf7c3335ebf4a9194e837f9eb8135fae11356 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Enable C++11 mode in compilersKai Koehne2014-06-191-1/+1
| | | | | | | | Qt 5 uses C++11 features mostly for speeding up things. Change-Id: Idcb3a95cd24b44c5147ff2e14f468f069da5e0c3 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Remove superfluous Qt4 code.kh12014-06-041-13/+1
| | | | | Change-Id: I0bd609dec191fdf65fb2370cd68291e87ae62750 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Fix qmake warning about "Redundant entries in QTPLUGIN"Kai Koehne2014-06-041-1/+0
| | | | | | | | | | | | | Fix qmake warning Redundant entries in QTPLUGIN: qico qtaccessiblewidgets In qtbase commit 4255ba40ab073af (Qt 5.3.0 and newer) the plugins are added automatically, based on the Qt module one links against. Change-Id: I45200db2f3bf9b6194f92bf864ab58ceb5c71f16 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Master needs at least Qt 5.3.0.kh12014-06-031-0/+23
| | | | | | Change-Id: I3bdd1c80d6709b0ef92f8d2bc8cab16fe7ed62b6 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Replace script with js engine.kh12014-06-031-1/+1
| | | | | Change-Id: Ic9c88e27dca1e936ba09a3776df3df7ec166c606 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Cleanup to support Qt5 only.kh12014-06-021-16/+5
| | | | | Change-Id: Ib8f61229ce2f07e52c22a15e10dc817aca860ead Reviewed-by: Niels Weber <niels.weber@digia.com>
* Update version numberKai Koehne2014-04-041-1/+1
| | | | | Change-Id: Id67d098d554030aa3c8425ad306eed72a187f771 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Merge remote-tracking branch 'origin/1.5'Oswald Buddenhagen2014-03-271-4/+8
|\ | | | | | | | | | | | | Conflicts: installerfw.pri Change-Id: I8bd85997fef0fcfa21a4dd28a6362748a54a4a3b
| * Add ts-<lang>, ts-all, commit-ts rules for translationsTakumi Asaki2014-02-101-3/+9
| | | | | | | | | | | | | | | | Add ts-<lang>, ts-all, commit-ts rules to src/sdk/sdk.pro for translator's convenience. Change-Id: Ie75641870e78b78f4db04ec9c7e4460b86d079c8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Add lconvert to pri file.Niels Weber2014-03-191-0/+2
| | | | | | | | | | Change-Id: I09da477700da81a4fd678b959553e2078b8c1bc0 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Bump versionNiels Weber2014-03-061-1/+1
| | | | | | | | | | Change-Id: Ie693487fd2d2c6fd5c60955b2face7eb2e58ac94 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Silence private header warning.Niels Weber2014-02-171-0/+1
|/ | | | | | | | IFW has to be build statically anyway to be of use, so this warning isn't needed. Change-Id: I1062a299acc1bf1af83d93f597fe9db15da2bed5 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Compile fix after native separator change.kh12014-02-041-0/+3
| | | | | Change-Id: I3044637a65b87483dd9ded63920adb5536952700 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix: Path handling in project filesTakumi Asaki2014-02-031-3/+3
| | | | | | | | | | | Because of cleanPath() converts native separators to '/', call toNativeSeparators() after cleanPath(). Due to warning message from "if (exists(filePath))" on Windows, if() around the exists() are removed. Change-Id: I412fe83f13365c8eec00e119270d07ce7f72297d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Bump version numberNiels Weber2014-01-291-2/+1
| | | | | Change-Id: I22bda59c70f54336d82dc9bbbedf9330b47478c8 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* increase version to 1.5Tim Jenssen2013-10-251-1/+1
| | | | | Change-Id: Ia128e8b214835052507d79348714efc947f72f15 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>