Revert "Add support for unified packaging configuration"

Causes multitude of problems, reverting and fixing.

This reverts commit 3055eab4c65a45d292c76335a965777a019942bf.

Change-Id: I5639fbf6f02d90312cf068720b9b9d29126b4b87
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>

1 files changed, 25 insertions, 14 deletions

diff --git a/packaging-tools/sdkcomponent.py b/packaging-tools/sdkcomponent.py
index 32510b35e..b3fa22683 100644
--- a/packaging-tools/sdkcomponent.py
+++ b/packaging-tools/sdkcomponent.py
@@ -1,27 +1,40 @@
 #!/usr/bin/env python
 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
+## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Contact: http://www.qt-project.org/legal
 ##
 ## This file is part of the release tools of the Qt Toolkit.
 ##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## $QT_BEGIN_LICENSE:LGPL$
 ## 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 https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
+## a written agreement between you and Digia.  For licensing terms and
+## conditions see http://qt.digia.com/licensing.  For further information
+## use the contact form at http://qt.digia.com/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 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Digia gives you certain additional
+## rights.  These rights are described in the Digia Qt 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.
+## General Public License version 3.0 as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU General Public License version 3.0 requirements will be
+## met: http://www.gnu.org/copyleft/gpl.html.
+##
 ##
 ## $QT_END_LICENSE$
 ##
@@ -95,8 +108,7 @@ class SdkComponent:
         self.sorting_priority            = bldinstallercommon.safe_config_key_fetch(target_config, section_name, 'sorting_priority')
         self.optional_for_offline        = False
         self.key_value_substitution_list = key_value_substitution_list
-        self.archive_skip                = False
-        self.include_filter              = bldinstallercommon.safe_config_key_fetch(target_config, section_name, 'include_filter')
+        self.archive_skip           = False
         if is_offline_build:
             tmp = bldinstallercommon.safe_config_key_fetch(target_config, section_name, 'optional_for_offline')
             for item in self.key_value_substitution_list:
@@ -234,7 +246,6 @@ class SdkComponent:
             return
         if self.root_component:
             print ' Root component:      ' + self.root_component
-        print ' Include filter:      ' + self.include_filter
         print ' Target install base: ' + self.target_install_base
         print ' Version:             ' + self.version
         print ' Version tag:         ' + self.version_tag