summaryrefslogtreecommitdiffstats
path: root/Changelog
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2017-01-30 14:39:06 +0200
committerKatja Marttila <katja.marttila@qt.io>2017-01-30 14:40:26 +0200
commit9772474dd97e5543035b5fd0dde4b731745e5057 (patch)
tree3319e942a3c59f0b83fbeee90e33728497875379 /Changelog
parent7121482f04c0ffb31411cc2037dc34cc66888a8f (diff)
parentc9d11cc9915dea32d1aff9d63427bca1c3399400 (diff)
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
Diffstat (limited to 'Changelog')
-rw-r--r--Changelog5
1 files changed, 5 insertions, 0 deletions
diff --git a/Changelog b/Changelog
index 3d38199b6..678df0572 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,10 @@
2.1.0
+2.0.5
+- Fix hang in Windows when admin rights needed. (QTIFW-902)
+- Use deterministic sorting order for components. (QTIFW-833)
+- Resolve relative URLs from Updates.xml.
+
2.0.4
- Set also display name for Repository action "remove"
- Adjusted wrong repogen parameter name