installer-framework/installer-framework.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/2.0'	Katja Marttila	2017-01-30	1	-17/+12
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	License header update to GPL-EXCEPT	Katja Marttila	2017-01-26	1	-17/+12
\| \| \| \| \| \| \| \| \| \|	Change-Id: I6426c4e8f932cf26c6c638dec18d0c12e22972d1 Reviewed-by: Janne Anttila <janne.anttila@theqtcompany.com>
\| *	Fix compile with namespace'ed Qt.	Karsten Heimrich	2016-01-21	1	-0/+2
\| \| \| \| \| \| \| \| \| \|	Change-Id: I9c0d399943d2f6eb9a0ab136abf24a5c8b108abb Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* \|	Merge remote-tracking branch 'origin/2.0'	Iikka Eklund	2016-01-20	1	-4/+3
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Update license headers	Iikka Eklund	2015-12-29	1	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
* \|	Compile with namespaces.	Karsten Heimrich	2015-09-07	1	-1/+1
\|/ \| \| \| \| \|	Change-Id: I734b0e27d53fd8b6199a3fb5891497df0e1815bb Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
*	Update Copyright	Kai Koehne	2015-02-18	1	-7/+7
\| \| \| \| \|	Change-Id: I8dde6629cfd461104364d5cdc255cb54b58283fa Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
*	Ask for proxy credentials in modal dialog	Kai Koehne	2014-11-18	1	-0/+66
	If a proxy requires authentication, DownloadFileTask will throw an exception of type ProxyAuthenticationRequiredException. This exception is handled in MetadataJob to first ask the user for credentials, storing them in PackageManagerProxyFactory, and then retriggering the download. Change-Id: I0d69504d3f90d503d83c7b2229bc670756fa1463 GPush-Base: 9aeb0197e58d630ef7e657bb05671d6ec7b3f5ec Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>