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

..

buttons.qdoc

Update license headers

2015-12-29 07:31:11 +00:00

component.qdoc

Revert "Use QQmlV4Function to correctly get empty parameters from script."

2016-02-17 11:20:56 +00:00

console.qdoc

Update license headers

2015-12-29 07:31:11 +00:00

gui.qdoc

Introduced gui.setTextItems() method

2016-06-15 09:48:16 +00:00

packagemanagercore.qdoc

Make communication via installer.execute() Unicode safe

2016-03-30 21:13:03 +00:00

print.qdoc

Update license headers

2015-12-29 07:31:11 +00:00

qdesktopservices.qdoc

Update license headers

2015-12-29 07:31:11 +00:00

qfiledialog.qdoc

Update license headers

2015-12-29 07:31:11 +00:00

qinstaller.qdoc

Update license headers

2015-12-29 07:31:11 +00:00