Merge remote-tracking branch 'origin/4.11'

Change-Id: Ib47833b23e90c5f08b318d3d4985a4f3a450ee4b
2020-01-15 07:21:52 +01:00
parent 43f364deb0 c22a840b10
commit 1c37415604
23 changed files with 43 additions and 52 deletions
--- a/cmake/QtCreatorAPI.cmake
+++ b/cmake/QtCreatorAPI.cmake
@@ -473,6 +473,7 @@ function(add_qtc_library name)
  set_target_properties(${name} PROPERTIES
    SOURCES_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
    VERSION "${IDE_VERSION}"
+    SOVERSION "${PROJECT_VERSION_MAJOR}"
    CXX_VISIBILITY_PRESET hidden
    VISIBILITY_INLINES_HIDDEN ON
    BUILD_RPATH "${_LIB_RPATH}"
--- a/doc/src/editors/creator-code-syntax.qdoc
+++ b/doc/src/editors/creator-code-syntax.qdoc
@@ -50,7 +50,7 @@

    To modify the colors used for underlining errors and warnings, select
    \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
-    \uicontrol {Fonts & Colors} > \uicontrol Copy, and select new colors for
+    \uicontrol {Font & Colors} > \uicontrol Copy, and select new colors for
    \uicontrol Error and \uicontrol Warning.

    \section1 Viewing Annotations
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -113,7 +113,7 @@ macx {
    BINDIST_SOURCE.debug = "$$OUT_PWD/bin"
    BINDIST_EXCLUDE_ARG.debug = "--exclude-toplevel"
    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}\"
+    codesign.commands = codesign --deep -o runtime -s \"$(SIGNING_IDENTITY)\" $(SIGNING_FLAGS) \"$${APPBUNDLE}\"
    dmg.commands = python -u \"$$PWD/scripts/makedmg.py\" \"$${BASENAME}.dmg\" \"Qt Creator\" \"$$IDE_SOURCE_TREE\" \"$$OUT_PWD/bin\"
    #dmg.depends = deployqt
    QMAKE_EXTRA_TARGETS += codesign dmg
--- a/share/qtcreator/debugger/lldbbridge.py
+++ b/share/qtcreator/debugger/lldbbridge.py
@@ -29,6 +29,7 @@ import platform
 import re
 import sys
 import threading
+import time
 import lldb

 from contextlib import contextmanager
@@ -953,14 +954,16 @@ class Dumper(DumperBase):

    def loop(self):
        event = lldb.SBEvent()
-        broadcaster = self.target.GetBroadcaster()
+        #broadcaster = self.target.GetBroadcaster()
        listener = self.debugger.GetListener()
+
        while True:
-            sys.stdout.flush() # IMPORTANT! to receive process state changes with lldb 1100
            while listener.GetNextEvent(event):
                self.handleEvent(event)
-            if listener.WaitForEventForBroadcaster(0, broadcaster, event):
-                self.handleEvent(event)
+            time.sleep(0.25)
+
+            #if listener.WaitForEventForBroadcaster(0, broadcaster, event):
+            #    self.handleEvent(event)


    def describeError(self, error):
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnchorRow.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnchorRow.qml
@@ -26,7 +26,6 @@
 import QtQuick 2.0
 import HelperWidgets 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Controls 1.0 as Controls
 import QtQuickDesignerTheme 1.0

 import StudioControls 1.0 as StudioControls
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ActionIndicator.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ActionIndicator.qml
@@ -25,7 +25,6 @@

 import QtQuick 2.1
 import StudioControls 1.0 as StudioControls
-import QtQuick.Controls.Styles 1.1

 StudioControls.ActionIndicator {
 }
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CheckBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CheckBox.qml
@@ -25,7 +25,6 @@

 import QtQuick 2.1
 import StudioControls 1.0 as StudioControls
-import QtQuick.Controls.Styles 1.1

 StudioControls.CheckBox {
    id: checkBox
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml
@@ -24,7 +24,6 @@
 ****************************************************************************/

 import QtQuick 2.1
-import QtQuick.Controls 1.0 as Controls

 Item {
    id: colorButton
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorLine.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorLine.qml
@@ -25,7 +25,6 @@

 import QtQuick 2.1
 import HelperWidgets 2.0
-import QtQuick.Controls.Private 1.0 // showing a ToolTip

 Item {
    width: 300
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml
@@ -24,7 +24,6 @@
 ****************************************************************************/

 import QtQuick 2.1
-import QtQuick.Controls.Styles 1.1
 import StudioControls 1.0 as StudioControls
 import StudioTheme 1.0 as StudioTheme

--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientLine.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientLine.qml
@@ -25,7 +25,6 @@

 import QtQuick 2.1
 import HelperWidgets 2.0
-import QtQuick.Controls.Private 1.0 // showing a ToolTip

 Item {
    width: 300
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Label.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Label.qml
@@ -24,13 +24,12 @@
 ****************************************************************************/

 import QtQuick 2.1
-import QtQuick.Controls 1.1 as Controls
 import QtQuick.Layouts 1.0
-import QtQuick.Controls.Private 1.0
+import QtQuick.Controls 2.12
 import QtQuickDesignerTheme 1.0
 import StudioTheme 1.0 as StudioTheme

-Controls.Label {
+Label {
    id: label

    property alias tooltip: toolTipArea.tooltip
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.qml
@@ -26,7 +26,6 @@
 import QtQuick 2.2
 import StudioControls 1.0 as StudioControls
 import StudioTheme 1.0 as StudioTheme
-import QtQuick.Controls.Styles 1.0
 import QtQuickDesignerTheme 1.0

 StudioControls.TextField {
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/MarginSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/MarginSection.qml
@@ -26,7 +26,6 @@
 import QtQuick 2.1
 import HelperWidgets 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Controls 1.0 as Controls

 Section {
    caption: qsTr("Margin")
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/PaddingSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/PaddingSection.qml
@@ -26,7 +26,6 @@
 import QtQuick 2.1
 import HelperWidgets 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Controls 1.0 as Controls

 Section {
    caption: qsTr("Padding")
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SecondColumnLayout.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SecondColumnLayout.qml
@@ -24,7 +24,6 @@
 ****************************************************************************/

 import QtQuick 2.1
-import QtQuick.Controls 1.0 as Controls
 import QtQuick.Layouts 1.0

 RowLayout {
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SectionLayout.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SectionLayout.qml
@@ -24,7 +24,6 @@
 ****************************************************************************/

 import QtQuick 2.1
-import QtQuick.Controls 1.0 as Controls
 import QtQuick.Layouts 1.0

 GridLayout {
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SimpleColorPalette.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SimpleColorPalette.qml
@@ -24,10 +24,8 @@
 ****************************************************************************/

 import QtQuick 2.1
-import QtQuick.Controls 2.5
 import StudioControls 1.0 as StudioControls
 import HelperWidgets 2.0
-import QtQuick.Controls.Private 1.0 // showing a ToolTip

 Item {
    property color selectedColor
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml
@@ -24,7 +24,6 @@
 ****************************************************************************/

 import QtQuick 2.1
-import QtQuick.Controls.Styles 1.1
 import StudioControls 1.0 as StudioControls
 import StudioTheme 1.0 as StudioTheme

--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml
@@ -28,7 +28,6 @@ import HelperWidgets 2.0
 import StudioControls 1.0 as StudioControls
 import StudioTheme 1.0 as StudioTheme
 import QtQuick.Layouts 1.0
-import QtQuick.Controls.Styles 1.1

 RowLayout {
    id: urlChooser
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -203,7 +203,9 @@ void LldbEngine::setupEngine()
    const FilePath lldbCmd = runParameters().debugger.executable;

    showMessage("STARTING LLDB: " + lldbCmd.toUserOutput());
-    m_lldbProc.setEnvironment(runParameters().debugger.environment);
+    Environment environment = runParameters().debugger.environment;
+    environment.appendOrSet("PYTHONUNBUFFERED", "1");  // avoid flushing problem on macOS
+    m_lldbProc.setEnvironment(environment);
    if (QFileInfo(runParameters().debugger.workingDirectory).isDir())
        m_lldbProc.setWorkingDirectory(runParameters().debugger.workingDirectory);

--- a/src/plugins/qtsupport/exampleslistmodel.cpp
+++ b/src/plugins/qtsupport/exampleslistmodel.cpp
@@ -488,8 +488,11 @@ void ExamplesListModel::updateExamples()
                break;
            }

-        if (reader.hasError() && debugExamples())
-            qWarning() << QString::fromLatin1("ERROR: Could not parse file as XML document (%1)").arg(exampleSource);
+        if (reader.hasError() && debugExamples()) {
+            qWarning().noquote().nospace() << "ERROR: Could not parse file as XML document ("
+                << exampleSource << "):" << reader.lineNumber() << ':' << reader.columnNumber()
+                << ": " << reader.errorString();
+        }
    }
    endResetModel();
 }
--- a/src/plugins/qtsupport/qtcreator_tutorials.xml
+++ b/src/plugins/qtsupport/qtcreator_tutorials.xml
@@ -91,9 +91,9 @@
      <description><![CDATA[Customizing Qt Creator to fit your own or your customers' purposes.]]></description>
      <tags>qt creator,configuration,talk,2013</tags>
    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt Creator - Plugin Development" isVideo="true" videoUrl="http://www.youtube.com/watch?v=6AEYgVPjl-s" videoLength="59:49">
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: How to create a plugin for Qt Creator" isVideo="true" videoUrl="https://youtu.be/PzV2MYRAUYQ" videoLength="55:37">
      <description><![CDATA[Adding plugins to Qt Creator.]]></description>
-      <tags>qt creator,plugins,talk,2013</tags>
+      <tags>qt creator,plugins,talk,2019</tags>
    </tutorial>
    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt Creator - Using the QML Profiler" isVideo="true" videoUrl="https://www.youtube.com/watch?v=TiJiF0MOOFc" videoLength="55:12">
      <description><![CDATA[Monitoring the performance of a Qt Quick application.]]></description>
@@ -136,28 +136,27 @@
      <description><![CDATA[Overview of UI technologies that can be used with Qt.]]></description>
      <tags>qt quick,ui,widgets,talk,2016</tags>
    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt on Your Wrist" isVideo="true" videoUrl="https://youtu.be/Rd187QxihRo" videoLength="8:08">
-      <description><![CDATA[Running Qt apps on Android Wear devices.]]></description>
-      <tags>qt creator,android,talk,2016</tags>
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Code Once Deploy Everywhere: How Qt is ideal for cross-platform development" isVideo="true" videoUrl="https://youtu.be/sRihJdZFuCg" videoLength="42:37">
+      <description><![CDATA[Using Qt Creator for cross-platform development.]]></description>
+      <tags>qt creator,talk,2019</tags>
    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt on macOS - Updates" isVideo="true" videoUrl="https://youtu.be/qfyxXxeC73Y" videoLength="25:51">
-      <description><![CDATA[Using Qt with macOS native windows.]]></description>
-      <tags>macos,talk,2016</tags>
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: WEBASM with Qt - Qt for WebAssembly" isVideo="true" videoUrl="https://youtu.be/W3WC-VpKdGQ" videoLength="27:50">
+      <description><![CDATA[Running Qt applications on the Web using Qt for WebAssembly.]]></description>
+      <tags>qt creator,webassembly,emscripten,talk,2019</tags>
    </tutorial>
    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: How to Develop with Qt for Multiple Screen Resolutions and Platforms and Best Practices for an Efficient App Lifecycle with Qt" isVideo="true" videoUrl="https://youtu.be/qclquZ99ZVQ" videoLength="27:44">
      <description><![CDATA[Best practices for an efficient app lifecycle.]]></description>
      <tags>qt,qt quick,screen resolution,ui,talk,2016</tags>
    </tutorial>
-
-    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: App Development with Qt - Technical Tips and Examples for Development & Testing" isVideo="true" videoUrl="https://www.youtube.com/watch?v=OqqarK73I9E" videoLength="53:57">
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: App Development with Qt - Technical Tips and Examples for Development &amp; Testing" isVideo="true" videoUrl="https://www.youtube.com/watch?v=OqqarK73I9E" videoLength="53:57">
      <description><![CDATA[Technical tips and examples for developing and testing mobile apps.]]></description>
      <tags>android,ios,talk,2017</tags>
    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Technical Overview of Qt in Medical Devices" isVideo="true" videoUrl="https://www.youtube.com/watch?v=Xe5xebP9w94" videoLength="24:53">
-      <description><![CDATA[Developing UX and UI for medical devices.]]></description>
-      <tags>medical,ui,talk,2017</tags>
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt Designer tutorial: Integrate custom widgets" isVideo="true" videoUrl="https://youtu.be/B0X5FOev9Lw" videoLength="27:07">
+      <description><![CDATA[Integrating custom widgets into Qt Designer.]]></description>
+      <tags>qt designer,widgets,ui,talk,2019</tags>
    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Android & iOS - Put Your App on a Diet" isVideo="true" videoUrl="https://www.youtube.com/watch?v=3o2Wo4YzlII" videoLength="23:41">
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Android &amp; iOS - Put Your App on a Diet" isVideo="true" videoUrl="https://www.youtube.com/watch?v=3o2Wo4YzlII" videoLength="23:41">
      <description><![CDATA[Making Android and iOS apps smaller.]]></description>
      <tags>android,ios,talk,2017</tags>
    </tutorial>
@@ -165,21 +164,21 @@
      <description><![CDATA[Introducing Qt Application Manager plugin in Qt Creator.]]></description>
      <tags>automotive,application manager,talk,2017</tags>
    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Using Virtual Keyboards on Qt Embedded Devices" isVideo="true" videoUrl="https://www.youtube.com/watch?v=g0X2IZ9ZCTA" videoLength="19:32">
-      <description><![CDATA[Support text input via virtual keyboards on embedded devices.]]></description>
-      <tags>embedded,virtual keyboard,talk,2017</tags>
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: LTTng for full stack tracing" isVideo="true" videoUrl="https://youtu.be/v_ynSET9FHU" videoLength="25:46">
+      <description><![CDATA[Using tracing and profiling to optimize the startup time of apps.]]></description>
+      <tags>qt creator,qml profiler,ctf viewer,lttng,talk,2019</tags>
    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: No Limits - How to Make an More Complicated Mobile Business App" isVideo="true" videoUrl="https://www.youtube.com/watch?v=au3brB7lNms" videoLength="23:33">
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: No Limits - How to Make a More Complicated Mobile Business App" isVideo="true" videoUrl="https://www.youtube.com/watch?v=au3brB7lNms" videoLength="23:33">
      <description><![CDATA[Creating mobile business apps using Qt Quick Controls 2.]]></description>
      <tags>android,ios,qt quick,controls,talk,2017</tags>
    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt IVI - Integrating and Testing Vechile Functions with Qt Automotive Suite 1.3" isVideo="true" videoUrl="https://www.youtube.com/watch?v=CVhVAK10TDw" videoLength="46:41">
-      <description><![CDATA[Integrating and testing vehicle functions with Qt Automotive Suite.]]></description>
-      <tags>automotive,ivi,talk,2017</tags>
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt &amp; Yocto, an ECU development workflow" isVideo="true" videoUrl="https://youtu.be/ECA8_oLT0ZE" videoLength="29:08">
+      <description><![CDATA[Using Qt Creator kits and Yocto when developing for embedded devices.]]></description>
+      <tags>qt creator,kits,yocto,embedded,talk,2019</tags>
    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Breathing Life into Your Applications - Animation with Qt 3D" isVideo="true" videoUrl="https://www.youtube.com/watch?v=Cj5enhBlL28" videoLength="">
-      <description><![CDATA[Using the new animation subsystem of Qt 3D.]]></description>
-      <tags>talk,2017</tags>
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: How to build QML apps for webOS and the Qt Creator webOS Plugin" isVideo="true" videoUrl="https://youtu.be/Yms_MvWQVR0" videoLength="24:58">
+      <description><![CDATA[Running Qt Quick apps on webOS.]]></description>
+      <tags>qt quick,ui,webos,talk,2019</tags>
    </tutorial>
    </tutorials>
 </instructionals>