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
Katja Marttila
e87c58548a
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/7zip/7zip.pro
src/libs/7zip/win/CPP/7zip/UI/Common/Update.cpp
src/libs/installer/component.cpp
src/libs/installer/lib7z_facade.cpp
src/libs/installer/packagemanagercore.cpp
src/libs/installer/proxycredentialsdialog.h
src/sdk/translations/ja.ts
tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp
tests/auto/installer/scriptengine/tst_scriptengine.cpp
tests/auto/installer/settings/tst_settings.cpp
Change-Id: I3bb98b8490b3c3eb7f664c1abb7417155b5430b2
2016-06-21 12:32:42 +03:00
Katja Marttila
62c34c7e55
add make install functionality with INSTALL_ROOT
...
Change-Id: I8bad1c9bbe7b705ff0842f15fb0c9bc6c127e9bc
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
2016-05-19 09:02:03 +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
Kai Koehne
1e589e37a9
Unify translated error messages
...
* Enclose file paths in ""
* Localize file paths with QDir::toNativeSeparators.
* Make sure sentences end with a '.'
* Append error details always by ':', e.g.
tr("Failed to copy file '%1': %2").(...)
* Use 'directory' instead of 'folder' everywhere
Change-Id: Ie045f429f72ad5045c96537465c5fb9d2e99d250
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-06-24 09:22:42 +00:00
Karsten Heimrich
97b5fe3ebc
Update archivegen.
...
Stop on file errors. Better verbose/ help output. Add support
for compression level. Do not hide symbols in statically build
lib7z to use e.g. CPercentPrinter symbol in dynamic IFW builds.
Task-number: QTIFW-695
Change-Id: I18e2ea58b5f1880bfb7f3ed84e34b8810f864188
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-06-10 12:53:28 +00:00
Karsten Heimrich
02f1c6cde8
Split the huge header file in more dedicated ones.
...
Change-Id: I35a1500d5a9bb8986765488660cf0487c32d9720
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-06-10 08:15:45 +00:00
Karsten Heimrich
4677d36298
Update source tree with version 9.38.beta of LZMA SDK.
...
- Remove unused files.
- Split in .pri files.
- Add HEADERS section.
- Adjust lib7z_facade.
Change-Id: I31e7bafbfe1a9346364bd58c391601955f98ad3a
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-06-10 08:15:38 +00:00
Niels Weber
6c796ce13c
Correct usage info for archivegen
...
Change-Id: I51c5ba84320f4a31e1dce236157e53b57624f89d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-03-10 12:25:58 +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
Kai Koehne
4ebfecf411
Add LGPLv3 as new license
...
Change-Id: I61158f956894e209dccf83744b4753774676099d
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
2014-10-16 15:17:56 +02:00
kh1
8addcf763b
Replace script with js engine.
...
Change-Id: Ic9c88e27dca1e936ba09a3776df3df7ec166c606
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-03 10:51:51 +02:00
Tim Jenssen
d1bb751a38
introduce no_app_bundle.pri
...
- it tries to copy the needed qt_menu.nib dir
Change-Id: I04fe564f62e16847a417e47c9a0719c043c1f027
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-05-27 15:44:09 +02:00
Kai Koehne
61f5549578
Clean up Qt 5 build rules
...
Change-Id: I2e494d5f91d1cb740c6254544cf92daaae236f1a
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-03-06 14:37:44 +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
kh1
402aab76a6
Follow advice given by Joerg, DEPENDPATH is now deprecated.
...
Change-Id: I8e08618bcc88cc445c317c79d93cdf9f1f2ca5e8
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-11-20 15:27:48 +01:00
Tim Jenssen
4917152126
remove app_bundle config only if it is a static build on Mac
...
Change-Id: Id26c7fed5ee155ab971b2a81aa9beb0589411c56
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2012-11-09 08:59:36 +01:00
tjenssen
c266f5bdd6
no matter which verbose mode - warnings should be shown
...
- and creation of the exception shouldn't write the warning
- this should be happen in the catch block
Change-Id: I574c77fab42845079bda7c0d57c4a4a0bdbe1e7f
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-10-01 11:46:33 +02:00
Tim Jenssen
99e489c191
fix openpty static link problem
...
- as the linker only adds symbols which are needed,
the order of the libraries are important
Change-Id: Iad8e5a5015cc5949be9b8f0b01702a7f854f6d95
Reviewed-by: Rainer Keller <rainer.keller@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2012-06-12 15:34:55 +02:00
Tim Jenssen
2957e28288
remove the limitation that archivegen could handle directories only
...
Change-Id: I5e7b6740d6df1b858cee091a1174e8fd64e477a7
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
2012-05-14 16:39:00 +02:00
kh1
564ef62688
let repogen validate install scripts
...
Change-Id: I4d08e4c33c3d967d4cf45ef5cdb5f3c3e066cf67
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-03-27 14:57:48 +02:00
kh1
be3b47d0d5
Reorganize the tree, have better ifw.pri. Shadow build support.
...
Change-Id: I01fb12537f863ed0744979973c7e4153889cc5cb
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
2012-03-19 16:14:04 +01:00