Merge remote-tracking branch 'origin/4.12' into qds-1.50

Change-Id: Ie6bbc48ea0ac9f2ce983825685b4e9b87ec5083d

doc/qtcreator/src/mcu/creator-mcu-dev.qdoc

@@ -176,7 +176,7 @@
 
     \list 1
         \li Select \uicontrol File > \uicontrol {New File or Project} >
-            \uicontrol {Application (Qt Quick)} >
+            \uicontrol {Application (Qt for MCU)} >
             \uicontrol {MCU Support Application} > \uicontrol Choose.
         \li Follow the instructions of the wizard to create the project.
         \li Select \uicontrol Projects > \uicontrol {Build & Run}, and then

scripts/build.py

@@ -83,6 +83,10 @@ def get_arguments():
                         action='store_true', default=(not common.is_windows_platform()))
     parser.add_argument('--no-docs', help='Skip documentation generation',
                         action='store_true', default=False)
+    parser.add_argument('--no-dmg', help='Skip disk image creation (macOS)',
+                        action='store_true', default=False)
+    parser.add_argument('--no-zip', help='Skip creation of 7zip files for install and developer package',
+                        action='store_true', default=False)
     return parser.parse_args()
 
 def build_qtcreator(args, paths):
@@ -124,8 +128,7 @@ def build_qtcreator(args, paths):
                                '-DPYTHON_INCLUDE_DIR=' + os.path.join(args.python_path, 'include')]
 
     # TODO this works around a CMake bug https://gitlab.kitware.com/cmake/cmake/issues/20119
-    if common.is_linux_platform():
+    cmake_args += ['-DBUILD_WITH_PCH=OFF']
-        cmake_args += ['-DBUILD_WITH_PCH=OFF']
 
     ide_revision = common.get_commit_SHA(paths.src)
     if ide_revision:
@@ -191,30 +194,32 @@ def deploy_qt(args, paths):
                                 paths.build)
 
 def package_qtcreator(args, paths):
-    common.check_print_call(['7z', 'a', '-mmt2', os.path.join(paths.result, 'qtcreator.7z'), '*'],
+    if not args.no_zip:
-                            paths.install)
+        common.check_print_call(['7z', 'a', '-mmt2', os.path.join(paths.result, 'qtcreator.7z'), '*'],
-    common.check_print_call(['7z', 'a', '-mmt2',
+                                paths.install)
-                             os.path.join(paths.result, 'qtcreator_dev.7z'), '*'],
-                            paths.dev_install)
-    if common.is_windows_platform():
         common.check_print_call(['7z', 'a', '-mmt2',
-                                 os.path.join(paths.result, 'wininterrupt.7z'), '*'],
+                                 os.path.join(paths.result, 'qtcreator_dev.7z'), '*'],
-                                paths.wininterrupt_install)
+                                paths.dev_install)
-        if not args.no_cdb:
+        if common.is_windows_platform():
             common.check_print_call(['7z', 'a', '-mmt2',
-                                     os.path.join(paths.result, 'qtcreatorcdbext.7z'), '*'],
+                                     os.path.join(paths.result, 'wininterrupt.7z'), '*'],
-                                    paths.qtcreatorcdbext_install)
+                                    paths.wininterrupt_install)
+            if not args.no_cdb:
+                common.check_print_call(['7z', 'a', '-mmt2',
+                                         os.path.join(paths.result, 'qtcreatorcdbext.7z'), '*'],
+                                        paths.qtcreatorcdbext_install)
 
     if common.is_mac_platform():
         if args.keychain_unlock_script:
             common.check_print_call([args.keychain_unlock_script], paths.install)
-        common.check_print_call(['python', '-u',
+        if not args.no_dmg:
-                                 os.path.join(paths.src, 'scripts', 'makedmg.py'),
+            common.check_print_call(['python', '-u',
-                                 'qt-creator.dmg',
+                                     os.path.join(paths.src, 'scripts', 'makedmg.py'),
-                                 'Qt Creator',
+                                     'qt-creator.dmg',
-                                 paths.src,
+                                     'Qt Creator',
-                                 paths.install],
+                                     paths.src,
-                                paths.result)
+                                     paths.install],
+                                    paths.result)
 
 def get_paths(args):
     Paths = collections.namedtuple('Paths',

scripts/build_plugin.py

@@ -0,0 +1,130 @@
+#!/usr/bin/env python
+#############################################################################
+##
+## Copyright (C) 2020 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: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 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.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# import the print function which is used in python 3.x
+from __future__ import print_function
+
+import argparse
+import collections
+import os
+
+import common
+
+def get_arguments():
+    parser = argparse.ArgumentParser(description='Build Qt Creator for packaging')
+    parser.add_argument('--name', help='Name to use for build results', required=True)
+    parser.add_argument('--src', help='Path to sources', required=True)
+    parser.add_argument('--build', help='Path that should be used for building', required=True)
+    parser.add_argument('--qt-path', help='Path to Qt', required=True)
+    parser.add_argument('--qtc-path',
+                        help='Path to Qt Creator installation including development package',
+                        required=True)
+    parser.add_argument('--output-path', help='Output path for resulting 7zip files')
+    parser.add_argument('--add-path', help='Adds a CMAKE_PREFIX_PATH to the build',
+                        action='append', dest='prefix_paths', default=[])
+    parser.add_argument('--deploy', help='Installs the "Dependencies" component of the plugin.',
+                        action='store_true', default=False)
+    parser.add_argument('--debug', help='Enable debug builds', action='store_true', default=False)
+    return parser.parse_args()
+
+def build(args, paths):
+    if not os.path.exists(paths.build):
+        os.makedirs(paths.build)
+    if not os.path.exists(paths.result):
+        os.makedirs(paths.result)
+    prefix_paths = [paths.qt, paths.qt_creator] + [os.path.abspath(fp) for fp in args.prefix_paths]
+    build_type = 'Debug' if args.debug else 'Release'
+    cmake_args = ['cmake',
+                  '-DCMAKE_PREFIX_PATH=' + ';'.join(prefix_paths),
+                  '-DCMAKE_BUILD_TYPE=' + build_type,
+                  '-DCMAKE_INSTALL_PREFIX=' + paths.install,
+                  '-G', 'Ninja']
+
+    # force MSVC on Windows, because it looks for GCC in the PATH first,
+    # even if MSVC is first mentioned in the PATH...
+    # TODO would be nicer if we only did this if cl.exe is indeed first in the PATH
+    if common.is_windows_platform():
+        cmake_args += ['-DCMAKE_C_COMPILER=cl',
+                       '-DCMAKE_CXX_COMPILER=cl']
+
+    # TODO this works around a CMake bug https://gitlab.kitware.com/cmake/cmake/issues/20119
+    cmake_args += ['-DBUILD_WITH_PCH=OFF']
+
+    ide_revision = common.get_commit_SHA(paths.src)
+    if ide_revision:
+        cmake_args += ['-DQTC_PLUGIN_REVISION=' + ide_revision]
+        with open(os.path.join(paths.result, args.name + '.7z.git_sha'), 'w') as f:
+            f.write(ide_revision)
+
+    common.check_print_call(cmake_args + [paths.src], paths.build)
+    common.check_print_call(['cmake', '--build', '.'], paths.build)
+    common.check_print_call(['cmake', '--install', '.', '--prefix', paths.install, '--strip'],
+                            paths.build)
+    if args.deploy:
+        common.check_print_call(['cmake', '--install', '.', '--prefix', paths.install,
+                                 '--component', 'Dependencies'],
+                                paths.build)
+    common.check_print_call(['cmake', '--install', '.', '--prefix', paths.dev_install,
+                             '--component', 'Devel'],
+                            paths.build)
+
+def package(args, paths):
+    if not os.path.exists(paths.result):
+        os.makedirs(paths.result)
+    common.check_print_call(['7z', 'a', '-mmt2', os.path.join(paths.result, args.name + '.7z'), '*'],
+                            paths.install)
+    if os.path.exists(paths.dev_install):  # some plugins might not provide anything in Devel
+        common.check_print_call(['7z', 'a', '-mmt2',
+                                 os.path.join(paths.result, args.name + '_dev.7z'), '*'],
+                                paths.dev_install)
+
+def get_paths(args):
+    Paths = collections.namedtuple('Paths',
+                                   ['qt', 'src', 'build', 'qt_creator',
+                                    'install', 'dev_install', 'result'])
+    build_path = os.path.abspath(args.build)
+    install_path = os.path.join(build_path, 'install')
+    result_path = os.path.abspath(args.output_path) if args.output_path else build_path
+    return Paths(qt=os.path.abspath(args.qt_path),
+                 src=os.path.abspath(args.src),
+                 build=os.path.join(build_path, 'build'),
+                 qt_creator=os.path.abspath(args.qtc_path),
+                 install=os.path.join(install_path, args.name),
+                 dev_install=os.path.join(install_path, args.name + '-dev'),
+                 result=result_path)
+
+def main():
+    args = get_arguments()
+    paths = get_paths(args)
+
+    build(args, paths)
+    package(args, paths)
+
+if __name__ == '__main__':
+    main()

src/plugins/fakevim/fakevimhandler.cpp

@@ -776,7 +776,13 @@ static QString fromLocalEncoding(const QByteArray &data)
 static QString getProcessOutput(const QString &command, const QString &input)
 {
     QProcess proc;
+#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
+    QStringList arguments = QProcess::splitCommand(command);
+    QString executable = arguments.takeFirst();
+    proc.start(executable, arguments);
+#else
     proc.start(command);
+#endif
     proc.waitForStarted();
     proc.write(toLocalEncoding(input));
     proc.closeWriteChannel();

src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp

@@ -289,7 +289,7 @@ void ItemLibraryModel::sortSections()
     int nullPointerSectionCount = m_sections.removeAll(QPointer<ItemLibrarySection>());
     QTC_ASSERT(nullPointerSectionCount == 0,;);
     auto sectionSort = [](ItemLibrarySection *first, ItemLibrarySection *second) {
-        return QString::localeAwareCompare(first->sortingName(), second->sortingName()) < 1;
+        return QString::localeAwareCompare(first->sortingName(), second->sortingName()) < 0;
     };
 
     std::sort(m_sections.begin(), m_sections.end(), sectionSort);

src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.cpp

@@ -91,7 +91,7 @@ void ItemLibrarySectionModel::sortItems()
     int nullPointerSectionCount = m_itemList.removeAll(QPointer<ItemLibraryItem>());
     QTC_ASSERT(nullPointerSectionCount == 0,;);
     auto itemSort = [](ItemLibraryItem *first, ItemLibraryItem *second) {
-        return QString::localeAwareCompare(first->itemName(), second->itemName()) < 1;
+        return QString::localeAwareCompare(first->itemName(), second->itemName()) < 0;
     };
 
     std::sort(m_itemList.begin(), m_itemList.end(), itemSort);

src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h

@@ -29,7 +29,7 @@
 
 #include "propertycontainer.h"
 #include <QPointer>
-#include <QSharedDataPointer>
+#include <memory>
 
 namespace QmlDesigner {
 
@@ -55,7 +55,7 @@ class QMLDESIGNERCORE_EXPORT ItemLibraryEntry
 
 public:
     ItemLibraryEntry();
-    ~ItemLibraryEntry();
+    ~ItemLibraryEntry() = default;
 
     QString name() const;
     TypeName typeName() const;
@@ -69,9 +69,6 @@ public:
     QString qmlSource() const;
     QString requiredImport() const;
 
-    ItemLibraryEntry(const ItemLibraryEntry &other);
-    ItemLibraryEntry& operator=(const ItemLibraryEntry &other);
-
     using Property = QmlDesigner::PropertyContainer;
 
     QList<Property> properties() const;
@@ -89,7 +86,7 @@ public:
     void addHints(const QHash<QString, QString> &hints);
 
 private:
-    QSharedDataPointer<Internal::ItemLibraryEntryData> m_data;
+    std::shared_ptr<Internal::ItemLibraryEntryData> m_data;
 };
 
 class QMLDESIGNERCORE_EXPORT ItemLibraryInfo : public QObject

src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp

@@ -35,12 +35,9 @@ namespace QmlDesigner {
 
 namespace Internal {
 
-class ItemLibraryEntryData : public QSharedData
+class ItemLibraryEntryData
 {
 public:
-    ItemLibraryEntryData()
-    {}
-
     QString name;
     TypeName typeName;
     QString category;
@@ -57,20 +54,6 @@ public:
 
 } // namespace Internal
 
-//
-// ItemLibraryEntry
-//
-
-ItemLibraryEntry::ItemLibraryEntry(const ItemLibraryEntry &other) = default;
-
-ItemLibraryEntry& ItemLibraryEntry::operator=(const ItemLibraryEntry &other)
-{
-    if (this !=&other)
-        m_data = other.m_data;
-
-    return *this;
-}
-
 void ItemLibraryEntry::setTypeIcon(const QIcon &icon)
 {
     m_data->typeIcon = icon;
@@ -96,8 +79,6 @@ ItemLibraryEntry::ItemLibraryEntry() : m_data(new Internal::ItemLibraryEntryData
     m_data->name.clear();
 }
 
-ItemLibraryEntry::~ItemLibraryEntry() = default;
-
 QString ItemLibraryEntry::name() const
 {
     return m_data->name;

src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp

@@ -258,6 +258,22 @@ void MetaInfoReader::readItemLibraryEntryProperty(const QString &name, const QVa
     }
 }
 
+inline QString deEscape(const QString &value)
+{
+    QString result = value;
+
+    result.replace(QStringLiteral("\\\""), QStringLiteral("\""));
+    result.replace(QStringLiteral("\\\\"), QStringLiteral("\\"));
+
+    return result;
+}
+
+inline QVariant deEscapeVariant(const QVariant &value)
+{
+    if (value.canConvert<QString>())
+        return deEscape(value.toString());
+    return value;
+}
 void MetaInfoReader::readPropertyProperty(const QString &name, const QVariant &value)
 {
     if (name == QStringLiteral("name")) {
@@ -265,7 +281,7 @@ void MetaInfoReader::readPropertyProperty(const QString &name, const QVariant &v
     } else if (name == QStringLiteral("type")) {
         m_currentPropertyType = value.toString();
     } else if (name == QStringLiteral("value")) {
-        m_currentPropertyValue = value;
+        m_currentPropertyValue = deEscapeVariant(value);
     } else {
         addError(tr("Unknown property for Property %1").arg(name), currentSourceLocation());
         setParserState(Error);