update tools generic packaging configurationv5.13.0-rc2-packaging

update changelog contents with IFW 3.1.1 details.
update ifw tools used for the generic tools repository build.
update maintenance tool version value.
component contains non-compressed static data, let binarycreator
handle the compression and inclusion.

Task-number: QTBUG-76063
Change-Id: I12dd3572e5d83791a00750ff187f24f8dd49237f
Reviewed-by: Katja Marttila <katja.marttila@qt.io>

4 files changed, 26 insertions, 32 deletions

diff --git a/packaging-tools/configurations/all-os/qt-installer-changelog b/packaging-tools/configurations/all-os/qt-installer-changelog
index 9462c4a15..d17d60b08 100644
--- a/packaging-tools/configurations/all-os/qt-installer-changelog
+++ b/packaging-tools/configurations/all-os/qt-installer-changelog
@@ -1,31 +1,26 @@
 #############################################################################
 ##
-## Copyright (C) 2015 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the release tools of the Qt Toolkit.
 ##
-## $QT_BEGIN_LICENSE:LGPL21$
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
 ##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
@@ -33,13 +28,3 @@
 
 
 [qt.installer.changelog]
-archives:               changelog_file
-target_install_base:    /dist
-
-[changelog_file]
-archive_uri:            installer-changelog
-package_strip_dirs:     0
-target_install_dir:     /
-rpath_target:
-archive_name:           installer-changelog.7z
-
diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.installer.changelog/data/installer-changelog b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.installer.changelog/data/dist/installer-changelog
index 027edfe0e..1b9f9e114 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.installer.changelog/data/installer-changelog
+++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.installer.changelog/data/dist/installer-changelog
@@ -1,4 +1,13 @@
 ****************************************************************************
+*                        3.1.1                                             *
+****************************************************************************
+- Revert "We don't patch product keys anymore so remove unnecessary code" (QTBUG-75323)
+- Fixed big maintenancetool in offline installs
+- Disallow navigating back to credentials page after it's first completion
+- Allow commercial installation from sign up fields
+- Improve offline installers login flow without internet connection
+
+****************************************************************************
 *                        3.1.0                                             *
 ****************************************************************************
 - Added support for repository categories
diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.installer.changelog/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.installer.changelog/meta/package.xml
index 16d283f24..41674be8c 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.installer.changelog/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.installer.changelog/meta/package.xml
@@ -7,5 +7,4 @@
     <AutoDependOn>qt</AutoDependOn>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <SortingPriority>0</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/releases/tools-generic b/packaging-tools/releases/tools-generic
index ddcae0bc5..8d7fe2bcc 100644
--- a/packaging-tools/releases/tools-generic
+++ b/packaging-tools/releases/tools-generic
@@ -2,14 +2,15 @@
 ## Global defines
 ################################################################################
 [ifwtools]
-windows-x86:                installer-framework-build-tqtc_3.1.0-win-x86.7z
-linux-x64:                  installer-framework-build-tqtc_3.1.0-linux-x64.7z
-mac-x64:                    installer-framework-build-tqtc_3.1.0-mac-x64.7z
+windows-x86:                http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/ifw/enterprise/unifiedqt/3.1.1/installer-framework-build-3.1.1-tqtc-win-x86.7z
+linux-x64:                  http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/ifw/enterprise/unifiedqt/3.1.1/installer-framework-build-3.1.1-tqtc-linux-x64.7z
+mac-x64:                    http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/ifw/enterprise/unifiedqt/3.1.1/installer-framework-build-3.1.1-tqtc-mac-x64.7z
+
 
 [release.global]
 version:                    1.0.0
 version_tag:
-arg_substitution_list:      %MAINTENANCE_TOOL_VERSION%=3.1.0
+arg_substitution_list:      %MAINTENANCE_TOOL_VERSION%=3.1.1
 
 ################################################################################
 ## Linux repository