Merge remote-tracking branch 'origin/4.5' into 4.6

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I52986bd2557490431bae48f9db86c848a95592d2

qbs/modules/qtc/qtc.qbs

@@ -17,7 +17,7 @@ Module {
     property string qtcreator_compat_version: ide_compat_version_major + '.'
             + ide_compat_version_minor + '.' + ide_compat_version_release
 
-    property string qtcreator_copyright_year: '2017'
+    property string qtcreator_copyright_year: '2018'
     property string qtcreator_copyright_string: "(C) " + qtcreator_copyright_year + " The Qt Company Ltd"
 
     property string ide_display_name: 'Qt Creator'

qtcreator.pri

@@ -5,7 +5,7 @@ QTCREATOR_VERSION = 4.5.82
 QTCREATOR_COMPAT_VERSION = 4.5.82
 VERSION = $$QTCREATOR_VERSION
 QTCREATOR_DISPLAY_VERSION = 4.6.0-beta1
-QTCREATOR_COPYRIGHT_YEAR = 2017
+QTCREATOR_COPYRIGHT_YEAR = 2018
 BINARY_ARTIFACTS_BRANCH = master
 
 isEmpty(IDE_DISPLAY_NAME):           IDE_DISPLAY_NAME = Qt Creator

qtcreator.pro

@@ -110,7 +110,6 @@ linux {
 macx {
     APPBUNDLE = "$$OUT_PWD/bin/Qt Creator.app"
     BINDIST_SOURCE = "$$OUT_PWD/bin/Qt Creator.app"
-    BINDIST_INSTALLER_SOURCE = $$BINDIST_SOURCE
     deployqt.commands = $$PWD/scripts/deployqtHelper_mac.sh \"$${APPBUNDLE}\" \"$$[QT_INSTALL_BINS]\" \"$$[QT_INSTALL_TRANSLATIONS]\" \"$$[QT_INSTALL_PLUGINS]\" \"$$[QT_INSTALL_IMPORTS]\" \"$$[QT_INSTALL_QML]\"
     codesign.commands = codesign --deep -s \"$(SIGNING_IDENTITY)\" $(SIGNING_FLAGS) \"$${APPBUNDLE}\"
     dmg.commands = $$PWD/scripts/makedmg.sh $$OUT_PWD/bin $${BASENAME}.dmg
@@ -118,7 +117,7 @@ macx {
     QMAKE_EXTRA_TARGETS += codesign dmg
 } else {
     BINDIST_SOURCE = "$(INSTALL_ROOT)$$QTC_PREFIX"
-    BINDIST_INSTALLER_SOURCE = "$$BINDIST_SOURCE/*"
+    BINDIST_EXCLUDE_ARG = "--exclude-toplevel"
     deployqt.commands = python -u $$PWD/scripts/deployqt.py -i \"$(INSTALL_ROOT)$$QTC_PREFIX\" \"$(QMAKE)\"
     deployqt.depends = install
     win32 {
@@ -138,10 +137,12 @@ isEmpty(INSTALLER_ARCHIVE_FROM_ENV) {
     INSTALLER_ARCHIVE = $$OUT_PWD/$$(INSTALLER_ARCHIVE)
 }
 
-#bindist.depends = deployqt
+INSTALLER_ARCHIVE_DEBUG = $$INSTALLER_ARCHIVE
-bindist.commands = 7z a -mx9 $$OUT_PWD/$${BASENAME}.7z \"$$BINDIST_SOURCE\"
+INSTALLER_ARCHIVE_DEBUG ~= s/(.*)[.]7z/\1-debug.7z
-#bindist_installer.depends = deployqt
+
-bindist_installer.commands = 7z a -mx9 $${INSTALLER_ARCHIVE} \"$$BINDIST_INSTALLER_SOURCE\"
+bindist.commands = python -u $$PWD/scripts/createDistPackage.py $$OUT_PWD/$${BASENAME}.7z \"$$BINDIST_SOURCE\"
+bindist_installer.commands = python -u $$PWD/scripts/createDistPackage.py $$BINDIST_EXCLUDE_ARG $${INSTALLER_ARCHIVE} \"$$BINDIST_SOURCE\"
+bindist_debug.commands = python -u $$PWD/scripts/createDistPackage.py --debug $$BINDIST_EXCLUDE_ARG $${INSTALLER_ARCHIVE_DEBUG} \"$$BINDIST_SOURCE\"
 
 win32 {
     deployqt.commands ~= s,/,\\\\,g
@@ -149,4 +150,4 @@ win32 {
     bindist_installer.commands ~= s,/,\\\\,g
 }
 
-QMAKE_EXTRA_TARGETS += deployqt bindist bindist_installer
+QMAKE_EXTRA_TARGETS += deployqt bindist bindist_installer bindist_debug

scripts/createDistPackage.py

@@ -0,0 +1,76 @@
+#!/usr/bin/env python
+############################################################################
+#
+# Copyright (C) 2018 The Qt Company Ltd.
+# Contact: https://www.qt.io/licensing/
+#
+# This file is part of Qt Creator.
+#
+# 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.
+#
+# 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.
+#
+############################################################################
+
+import argparse
+import os
+import shutil
+import subprocess
+import tempfile
+
+import common
+
+def parse_arguments():
+    parser = argparse.ArgumentParser(description="Create Qt Creator package, filtering out debug information files.")
+    parser.add_argument('--7z', help='path to 7z binary',
+        default='7z.exe' if common.is_windows_platform() else '7z',
+        metavar='<7z_binary>', dest='sevenzip')
+    parser.add_argument('--debug', help='package only the files with debug information',
+                        dest='debug', action='store_true', default=False)
+    parser.add_argument('--exclude-toplevel', help='do not include the toplevel source directory itself in the resulting archive, only its contents',
+                        dest='exclude_toplevel', action='store_true', default=False)
+    parser.add_argument('target_archive', help='output 7z file to create')
+    parser.add_argument('source_directory', help='source directory with the Qt Creator installation')
+    return parser.parse_args()
+
+def is_debug_file(filepath):
+    if common.is_mac_platform():
+        return filepath.endswith('.dSYM') or '.dSYM/' in filepath
+    elif common.is_linux_platform():
+        return filepath.endswith('.debug')
+    else:
+        return filepath.endswith('.pdb')
+
+def is_debug(path, filenames):
+    return [fn for fn in filenames if is_debug_file(os.path.join(path, fn))]
+
+def is_not_debug(path, filenames):
+    files = [fn for fn in filenames if os.path.isfile(os.path.join(path, fn))]
+    return [fn for fn in files if not is_debug_file(os.path.join(path, fn))]
+
+def main():
+    arguments = parse_arguments()
+    tempdir_base = tempfile.mkdtemp()
+    tempdir = os.path.join(tempdir_base, os.path.basename(arguments.source_directory))
+    try:
+        common.copytree(arguments.source_directory, tempdir, symlinks=True,
+            ignore=(is_not_debug if arguments.debug else is_debug))
+        zip_source = os.path.join(tempdir, '*') if arguments.exclude_toplevel else tempdir
+        subprocess.check_call([arguments.sevenzip, 'a', '-mx9',
+            arguments.target_archive, zip_source])
+    finally:
+        shutil.rmtree(tempdir_base)
+if __name__ == "__main__":
+    main()

src/libs/utils/mimetypes/mimeprovider.cpp

@@ -802,7 +802,12 @@ void MimeXMLProvider::ensureLoaded()
 
 //        if (!fdoXmlFound) {
 //            // We could instead install the file as part of installing Qt?
-            allFiles.prepend(QLatin1String(":/qt-project.org/qmime/freedesktop.org.xml"));
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
+              const char freedesktopOrgXml[] = ":/qt-project.org/qmime/packages/freedesktop.org.xml";
+#else
+              const char freedesktopOrgXml[] = ":/qt-project.org/qmime/freedesktop.org.xml";
+#endif
+            allFiles.prepend(QLatin1String(freedesktopOrgXml));
 //        }
 
         m_nameMimeTypeMap.clear();