From a98c8b659a8ef2851b06fcd682620069d63c42ef Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 8 Apr 2019 09:14:06 +0200 Subject: [PATCH 01/23] Squish: Adapt to changed object names Dock widgets now get an ID representing the running engine number additionally. Change-Id: I8c9b6c1a2a92fb92e84b49d91ac1d3caeeb42411 Reviewed-by: Robert Loehning --- tests/system/objects.map | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/objects.map b/tests/system/objects.map index 27cb7429d0c..276ae23b357 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -45,7 +45,7 @@ :CppTools__Internal__CompletionSettingsPage.Behavior_QGroupBox {container=':qt_tabwidget_stackedwidget_QScrollArea' name='groupBox' title='Behavior' type='QGroupBox' visible='1'} :DebugModeWidget.Debugger Log_QDockWidget {container=':Qt Creator.DebugModeWidget_QSplitter' name='GlobalLogDockWidget' type='QDockWidget' visible='1'} :DebugModeWidget.Debugger.Docks.BreakDockWidget_QDockWidget {container=':Qt Creator.DebugModeWidget_QSplitter' name='Debugger.Docks.BreakpointManagerDockWidget' type='QDockWidget' visible='1'} -:DebugModeWidget.Debugger.Docks.LocalsAndInspectorDockWidget_QDockWidget {container=':Qt Creator.DebugModeWidget_QSplitter' name='Debugger.Docks.LocalsAndInspectorDockWidget' type='QDockWidget' visible='1'} +:DebugModeWidget.Debugger.Docks.LocalsAndInspectorDockWidget_QDockWidget {container=':Qt Creator.DebugModeWidget_QSplitter' name~='Debugger\\\\.Dock\\\\.LocalsAndInspector\\\\.\\\\d+DockWidget' type='QDockWidget' visible='1'} :DebugModeWidget.OK_QPushButton {container=':Qt Creator.DebugModeWidget_QSplitter' text='OK' type='QPushButton' unnamed='1' visible='1'} :DebugModeWidget.Toolbar_QDockWidget {container=':Qt Creator.DebugModeWidget_QSplitter' name='Toolbar' type='QDockWidget' visible='1'} :DebugModeWidget_Debugger::Internal::ConsoleView {container=':Qt Creator.DebugModeWidget_QSplitter' type='Debugger::Internal::ConsoleView' unnamed='1' visible='1'} @@ -54,7 +54,7 @@ :Debugger Toolbar.Exit Debugger_QToolButton {container=':DebugModeWidget.Toolbar_QDockWidget' text='Stop Debugger' type='QToolButton' unnamed='1' visible='1'} :Debugger Toolbar.StatusText_Utils::StatusLabel {container=':DebugModeWidget.Toolbar_QDockWidget' type='Utils::StatusLabel' unnamed='1'} :Debugger.Docks.BreakDockWidget.Debugger.Docks.Break_QFrame {container=':DebugModeWidget.Debugger.Docks.BreakDockWidget_QDockWidget' name='Debugger.Docks.BreakpointManager' type='QFrame' visible='1'} -:Debugger.Docks.LocalsAndWatchersDockWidget.Inspector_QFrame {container=':DebugModeWidget.Debugger.Docks.LocalsAndInspectorDockWidget_QDockWidget' name='Inspector' type='QFrame' visible='1'} +:Debugger.Docks.LocalsAndWatchersDockWidget.Inspector_QFrame {container=':DebugModeWidget.Debugger.Docks.LocalsAndInspectorDockWidget_QDockWidget' name~='Debugger\\\\.Dock\\\\.Inspector\\\\.\\\\d+' type='QFrame' visible='1'} :Debugger::Internal::ConsoleEdit {columnIndex='0' container=':DebugModeWidget_Debugger::Internal::ConsoleView' rowIndex='0' type='Debugger::Internal::ConsoleEdit' unnamed='1' visible='1'} :Description.description_Utils::CompletingTextEdit {container=':splitter.Description_QGroupBox' name='description' type='Utils::CompletingTextEdit' visible='1'} :Dialog.OK_QPushButton {text='OK' type='QPushButton' unnamed='1' visible='1' window=':Dialog_QmlJSEditor::Internal::ComponentNameDialog'} From 0abcbac913c20837fbe867c953291e85e6bce450 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 8 Apr 2019 10:00:00 +0200 Subject: [PATCH 02/23] Squish: Remove checking KDE paster The KDE paster has changed again and does no more work and will be removed completely. Change-Id: I0eb00076219559ff594671dd6b1c8de5eca22f8b Reviewed-by: Robert Loehning --- tests/system/suite_tools/tst_codepasting/test.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/tests/system/suite_tools/tst_codepasting/test.py b/tests/system/suite_tools/tst_codepasting/test.py index 1a54fb89111..35f85ab9488 100644 --- a/tests/system/suite_tools/tst_codepasting/test.py +++ b/tests/system/suite_tools/tst_codepasting/test.py @@ -34,17 +34,13 @@ def __platformToBeRunToday__(): # for all machines using the same IP-address like you. skipPastingToPastebinCom = platform.system() not in __platformToBeRunToday__() -NAME_KDE = "Paste.KDE.Org" NAME_PBCOM = "Pastebin.Com" NAME_PCXYZ = "Pastecode.Xyz" serverProblems = "Server side problems." def invalidPasteId(protocol): - if protocol == NAME_KDE: - return None - else: - return -1 + return -1 def closeHTTPStatusAndPasterDialog(protocol, pasterDialog): try: @@ -170,7 +166,7 @@ def main(): startQC() if not startedWithoutPluginError(): return - protocolsToTest = [NAME_KDE, NAME_PBCOM, NAME_PCXYZ] + protocolsToTest = [NAME_PBCOM, NAME_PCXYZ] sourceFile = os.path.join(os.getcwd(), "testdata", "main.cpp") # make sure General Messages is open openGeneralMessages() @@ -179,10 +175,7 @@ def main(): with TestSection(protocol): skippedPasting = True description = "Paste from 2017-05-11" - if protocol == NAME_KDE: - pasteId = "pysjk6n2i" - pastedText = readFile(os.path.join(os.getcwd(), "testdata", "main-prepasted.cpp")) - elif skipPastingToPastebinCom and protocol == NAME_PBCOM: + if skipPastingToPastebinCom and protocol == NAME_PBCOM: pasteId = "8XHP0ZgH" pastedText = readFile(os.path.join(os.getcwd(), "testdata", "main-prepasted.cpp")) else: @@ -219,7 +212,7 @@ def main(): clickButton(waitForObject(":*Qt Creator.Clear_QToolButton")) continue test.compare(filenameCombo.currentText, "%s: %s" % (protocol, pasteId), "Verify title of editor") - if protocol in (NAME_KDE, NAME_PBCOM) and pastedText.endswith("\n"): + if protocol == NAME_PBCOM and pastedText.endswith("\n"): pastedText = pastedText[:-1] test.compare(editor.plainText, pastedText, "Verify that pasted and fetched texts are the same") invokeMenuItem("File", "Close All") From aacac489083071b133c7d0746d9c445e2ecf7ffa Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 8 Apr 2019 16:56:13 +0200 Subject: [PATCH 03/23] Doc: Replace "Qt Quick Controls 2" with "Qt Quick Controls" - Qt Quick Controls 1 has been removed and most link targets have been changed - Leave some link targets where links would break - Leave strings that still have the "2" in Qt Creator - Remove the obsolete dependency (QDoc complained about it) Change-Id: I05148df3b07b4499f802557252c028b11ca29213 Reviewed-by: Thomas Hartmann --- doc/config/qtcreator-project.qdocconf | 1 - .../creator-only/creator-tutorials.qdoc | 4 +- .../creator-projects-creating.qdoc | 2 +- .../creator-projects-custom-wizards-json.qdoc | 4 +- .../creator-mobile-app-tutorial.qdoc | 4 +- ...creator-tutorial-create-qq-project.qdocinc | 4 +- .../creator-only/qtquick-app-development.qdoc | 2 +- .../creator-only/qtquick-app-tutorial.qdoc | 5 +- .../creator-only/qtquick-creating.qdoc | 6 +- .../qtquick-modules-with-plugins.qdoc | 2 +- doc/src/qtquick/qtquick-components.qdoc | 72 +++++++++---------- doc/src/qtquick/qtquick-designer.qdoc | 2 +- doc/src/qtquick/qtquick-navigator.qdoc | 2 +- 13 files changed, 54 insertions(+), 56 deletions(-) diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf index b43166e8ad7..f7659e94d94 100644 --- a/doc/config/qtcreator-project.qdocconf +++ b/doc/config/qtcreator-project.qdocconf @@ -39,7 +39,6 @@ depends += qtwidgets \ qtgui \ qthelp \ qtquickcontrols \ - qtquickcontrols2 \ qtquickextras \ qtlinguist \ qtscxml \ diff --git a/doc/src/overview/creator-only/creator-tutorials.qdoc b/doc/src/overview/creator-only/creator-tutorials.qdoc index 2454f4db4b4..003422fef43 100644 --- a/doc/src/overview/creator-only/creator-tutorials.qdoc +++ b/doc/src/overview/creator-only/creator-tutorials.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -55,7 +55,7 @@ \li \l{Creating a Mobile Application} - Learn how to create a Qt Quick application using Qt Quick Controls 2 + Learn how to create a Qt Quick application using Qt Quick Controls for Android and iOS devices. \endlist diff --git a/doc/src/projects/creator-only/creator-projects-creating.qdoc b/doc/src/projects/creator-only/creator-projects-creating.qdoc index ba7a3374a43..43b2e39f700 100644 --- a/doc/src/projects/creator-only/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-only/creator-projects-creating.qdoc @@ -118,7 +118,7 @@ Create a Qt Quick application that uses \l{http://doc.qt.io/qt-5/qtquickcontrols2-index.html} - {Qt Quick Controls 2} to implement a scrollable list (requires + {Qt Quick Controls} to implement a scrollable list (requires Qt 5.9 or later) or a set of pages with a stack-based or swipe-based navigation model (requires Qt 5.7 or later). diff --git a/doc/src/projects/creator-only/creator-projects-custom-wizards-json.qdoc b/doc/src/projects/creator-only/creator-projects-custom-wizards-json.qdoc index 9e90847774f..c6dc6a24b4c 100644 --- a/doc/src/projects/creator-only/creator-projects-custom-wizards-json.qdoc +++ b/doc/src/projects/creator-only/creator-projects-custom-wizards-json.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -792,7 +792,7 @@ "data": { "wordWrap": true, - "trText": "Creates a deployable Qt Quick 2 application using Qt Quick Controls 2.", + "trText": "Creates a deployable Qt Quick 2 application using Qt Quick Controls.", } }, \endcode diff --git a/doc/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc b/doc/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc index fd013f9be3d..380192d9dd7 100644 --- a/doc/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc +++ b/doc/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -38,7 +38,7 @@ \title Creating a Mobile Application This tutorial describes developing Qt Quick applications for Android and iOS - devices using Qt Quick Controls 2. + devices using Qt Quick Controls. We use \QC to implement a Qt Quick application that accelerates an SVG (Scalable Vector Graphics) image based on the changing accelerometer values. diff --git a/doc/src/qtquick/creator-only/creator-tutorial-create-qq-project.qdocinc b/doc/src/qtquick/creator-only/creator-tutorial-create-qq-project.qdocinc index 1f6c306efd2..b3f2bc67a12 100644 --- a/doc/src/qtquick/creator-only/creator-tutorial-create-qq-project.qdocinc +++ b/doc/src/qtquick/creator-only/creator-tutorial-create-qq-project.qdocinc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -44,7 +44,7 @@ use for building and running the project: \l qmake, \l {Setting Up CMake}{CMake}, or \l {Setting Up Qbs}{Qbs}. - \li In the \uicontrol {Qt Quick Controls 2 Style} field, select one of + \li In the \uicontrol {Qt Quick Controls Style} field, select one of the predefined \l{Styling Qt Quick Controls 2}{UI styles} to use, and then select \uicontrol Next. diff --git a/doc/src/qtquick/creator-only/qtquick-app-development.qdoc b/doc/src/qtquick/creator-only/qtquick-app-development.qdoc index d026049d0d7..698dffa3aed 100644 --- a/doc/src/qtquick/creator-only/qtquick-app-development.qdoc +++ b/doc/src/qtquick/creator-only/qtquick-app-development.qdoc @@ -59,7 +59,7 @@ \li \l {Creating Components} You can use basic QML types to create your own components that you - can combine with ready-made Qt Quick Controls 2 and Layouts + can combine with ready-made Qt Quick Controls and Layouts (available since Qt 5.7). \li \l {Managing Item Hierarchy} diff --git a/doc/src/qtquick/creator-only/qtquick-app-tutorial.qdoc b/doc/src/qtquick/creator-only/qtquick-app-tutorial.qdoc index 829b8aee9c5..6592b10c45b 100644 --- a/doc/src/qtquick/creator-only/qtquick-app-tutorial.qdoc +++ b/doc/src/qtquick/creator-only/qtquick-app-tutorial.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -51,8 +51,7 @@ For more information about developing Qt Quick applications in the Design mode, see \l{Developing Qt Quick Applications}. - For examples of using Qt Quick Controls 2, see - \l{Qt Quick Controls 2 Examples}. + For examples of using Qt Quick Controls, see \l{Qt Quick Controls Examples}. \include creator-tutorial-create-qq-project.qdocinc qt quick application diff --git a/doc/src/qtquick/creator-only/qtquick-creating.qdoc b/doc/src/qtquick/creator-only/qtquick-creating.qdoc index 5c29c7e4309..cb7ebcd005c 100644 --- a/doc/src/qtquick/creator-only/qtquick-creating.qdoc +++ b/doc/src/qtquick/creator-only/qtquick-creating.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -136,7 +136,7 @@ \QC generates a QML file, \e main.qml, that you can modify in the Design mode. - \section1 Creating Qt Quick Controls 2 Applications + \section1 Creating Qt Quick Controls Applications \list 1 @@ -155,7 +155,7 @@ use for building and running the project: \l qmake, \l {Setting Up CMake}{CMake}, or \l {Setting Up Qbs}{Qbs}. - \li In the \uicontrol {Qt Quick Controls 2 Style} field, select one of + \li In the \uicontrol {Qt Quick Controls Style} field, select one of the predefined \l{Styling Qt Quick Controls 2}{UI styles} to use, and then select \uicontrol Next. diff --git a/doc/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc b/doc/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc index 118349a0ae7..0601da4e19f 100644 --- a/doc/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc +++ b/doc/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc @@ -179,6 +179,6 @@ qmlDesignerImportPaths in your product (for Qbs projects). Modules in the import paths defined in \c{QML_DESIGNER_IMPORT_PATH} will be used only in the Design mode. - For an example, see \l {Qt Quick Controls 2 - Contact List}. + For an example, see \l {Qt Quick Controls - Contact List}. */ diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc index 34ee756b434..a28a3af6432 100644 --- a/doc/src/qtquick/qtquick-components.qdoc +++ b/doc/src/qtquick/qtquick-components.qdoc @@ -119,13 +119,13 @@ \li \l{GridView}{Grid View} provides a grid vizualization of a model. \li \l{ListView}{List View} provides a list vizualization of a model. \li \l{PathView}{Path View} visualizes the contents of a model along a - path. - \li \l [QtQuickControls2] {ScrollView}{Scroll View} provides scrolling + path. For more information, see \l{Editing PathView Properties}. + \li \l [QtQuickControls] {ScrollView}{Scroll View} provides scrolling for user-defined content. It can be used instead of a \l Flickable item. - \li \l [QtQuickControls2] {StackView}{Stack View} provides a stack-based + \li \l [QtQuickControls] {StackView}{Stack View} provides a stack-based navigation model. - \li \l[QtQuickControls2] {SwipeView}{Swipe View} enables users to + \li \l[QtQuickControls] {SwipeView}{Swipe View} enables users to navigate pages by swiping sideways. \endlist @@ -333,21 +333,21 @@ \section2 Organizing Items - Since Qt 5.7, you can use the following \l{Qt Quick Controls 2} types to + Since Qt 5.7, you can use the following \l{Qt Quick Controls} types to organize items on screens: \list - \li \l [QtQuickControls2]{Frame} places a logical group of controls + \li \l [QtQuickControls]{Frame} places a logical group of controls within a visual frame. - \li \l [QtQuickControls2]{GroupBox}{Group Box} is used to lay out a + \li \l [QtQuickControls]{GroupBox}{Group Box} is used to lay out a logical group of controls together, within a titled visual frame. - \li \l [QtQuickControls2]{Label} is a text label with inherited styling + \li \l [QtQuickControls]{Label} is a text label with inherited styling and font. - \li \l [QtQuickControls2]{Page} provides a styled page control with + \li \l [QtQuickControls]{Page} provides a styled page control with support for a header and footer. - \li \l [QtQuickControls2]{PageIndicator}{Page Indicator} indicates the + \li \l [QtQuickControls]{PageIndicator}{Page Indicator} indicates the currently active page. - \li \l [QtQuickControls2]{Pane} provides a background matching with the + \li \l [QtQuickControls]{Pane} provides a background matching with the application style and theme. \endlist @@ -365,62 +365,62 @@ \li \l [QML]{MouseArea}{Mouse Area} enables simple mouse handling. \endlist - Since Qt 5.7, you can also use the following \l{Qt Quick Controls 2} types + Since Qt 5.7, you can also use the following \l{Qt Quick Controls} types to inform users about the progress of the application or to gather input from the user: \list - \li \l [QtQuickControls2]{BusyIndicator}{Busy Indicator} indicates + \li \l [QtQuickControls]{BusyIndicator}{Busy Indicator} indicates activity while content is being loaded. - \li \l [QtQuickControls2]{Button} provides a push button that you can + \li \l [QtQuickControls]{Button} provides a push button that you can associate with an action. - \li \l [QtQuickControls2]{CheckBox}{Check Box} provides an option button + \li \l [QtQuickControls]{CheckBox}{Check Box} provides an option button that can be toggled on (checked) or off (unchecked). - \li \l [QtQuickControls2]{CheckDelegate}{Check Delegate} presents an + \li \l [QtQuickControls]{CheckDelegate}{Check Delegate} presents an item delegate that can be toggled on (checked) or off (unchecked). - \li \l [QtQuickControls2]{ComboBox}{Combo Box} is a combined button and + \li \l [QtQuickControls]{ComboBox}{Combo Box} is a combined button and popup list that is populated by using a data model. - \li \l [QtQuickControls2]{DelayButton}{Delay Button} provides an option + \li \l [QtQuickControls]{DelayButton}{Delay Button} provides an option button that is triggered when held down long enough. - \li \l [QtQuickControls2]{Dial} is a circular dial that is rotated to + \li \l [QtQuickControls]{Dial} is a circular dial that is rotated to set a value. - \li \l [QtQuickControls2]{ProgressBar}{Progress Bar} indicates the + \li \l [QtQuickControls]{ProgressBar}{Progress Bar} indicates the progress of an operation. - \li \l [QtQuickControls2]{RadioButton}{Radio Button} provides an option + \li \l [QtQuickControls]{RadioButton}{Radio Button} provides an option button that can be switched on (checked) or off (unchecked). - \li \l [QtQuickControls2]{RadioDelegate}{Radio Delegate} presents an + \li \l [QtQuickControls]{RadioDelegate}{Radio Delegate} presents an item delegate that can be toggled on (checked) or off (unchecked). - \li \l [QtQuickControls2]{RangeSlider}{Range Slider} enables users to + \li \l [QtQuickControls]{RangeSlider}{Range Slider} enables users to select a range of values by sliding two handles along a track. - \li \l [QtQuickControls2]{RoundButton}{Round Button} provides a push + \li \l [QtQuickControls]{RoundButton}{Round Button} provides a push button with rounded corners that you can associate with an action. - \li \l [QtQuickControls2]{Slider} selects a value by sliding a handle + \li \l [QtQuickControls]{Slider} selects a value by sliding a handle along a track. - \li \l [QtQuickControls2]{SpinBox}{Spin Box} enables the user to specify + \li \l [QtQuickControls]{SpinBox}{Spin Box} enables the user to specify a value by clicking the up or down buttons, by pressing up or down on the keyboard, or by entering a value in the box. - \li \l [QtQuickControls2]{Switch} is an option button that can be + \li \l [QtQuickControls]{Switch} is an option button that can be toggled on or off. - \li \l [QtQuickControls2]{SwitchDelegate}{SwitchDelegate} presents an + \li \l [QtQuickControls]{SwitchDelegate}{Switch Delegate} presents an item delegate with a switch indicator that can be toggled on or off. - \li \l [QtQuickControls2] {TabBar}{Tab Bar} enables users to switch + \li \l [QtQuickControls] {TabBar}{Tab Bar} enables users to switch between different views or subtasks. - \li \l [QtQuickControls2]{TabButton}{Tab Button} is a button + \li \l [QtQuickControls]{TabButton}{Tab Button} is a button that is functionally similar to \uicontrol Button, but provides a look that is more suitable for a \uicontrol {Tab Bar}. - \li \l [QtQuickControls2]{TextArea}{Text Area} displays multiple lines + \li \l [QtQuickControls]{TextArea}{Text Area} displays multiple lines of editable formatted text. - \li \l [QtQuickControls2]{TextField}{Text Field} displays a single line + \li \l [QtQuickControls]{TextField}{Text Field} displays a single line of editable plain text. - \li \l [QtQuickControls2]{ToolBar}{Tool Bar} is a container of + \li \l [QtQuickControls]{ToolBar}{Tool Bar} is a container of application-wide and context sensitive actions and controls, such as navigation buttons and search fields. - \li \l [QtQuickControls2]{ToolButton}{Tool Button} is a button + \li \l [QtQuickControls]{ToolButton}{Tool Button} is a button that is functionally similar to \uicontrol Button, but provides a look that is more suitable for a \uicontrol {Tool Bar}. - \li \l [QtQuickControls2]{ToolSeparator}{Tool Separator} separates a + \li \l [QtQuickControls]{ToolSeparator}{Tool Separator} separates a group of items from adjacent items on a \uicontrol {Tool Bar}. - \li \l [QtQuickControls2]{Tumbler} is a spinnable wheel of items that + \li \l [QtQuickControls]{Tumbler} is a spinnable wheel of items that can be selected. \endlist diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/src/qtquick/qtquick-designer.qdoc index a1f2b0455e8..552dc43f402 100644 --- a/doc/src/qtquick/qtquick-designer.qdoc +++ b/doc/src/qtquick/qtquick-designer.qdoc @@ -73,7 +73,7 @@ \li \uicontrol {Library} (2) displays the building blocks that you can use to design applications: predefined QML types, your own - QML components, or Qt Quick Controls 2 that you import to the + QML components, or Qt Quick Controls that you import to the project, and other resources. For more information, see \l {Creating Components}. diff --git a/doc/src/qtquick/qtquick-navigator.qdoc b/doc/src/qtquick/qtquick-navigator.qdoc index 0215df96bec..3fe95176474 100644 --- a/doc/src/qtquick/qtquick-navigator.qdoc +++ b/doc/src/qtquick/qtquick-navigator.qdoc @@ -95,7 +95,7 @@ \uicontrol {Stack (z)}. To remove the \c z property, select \uicontrol {Reset z Property}. - You can also use a \uicontrol StackLayout item (Qt Quick Controls 2) to + You can also use a \uicontrol StackLayout item (Qt Quick Controls) to create a stacked view. For more information, see \l {Using Layouts}. \section1 Switching Parent Items From 11d7baf97d2ca94235f3828c41e4cc8b0b02a219 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 8 Apr 2019 16:59:05 +0200 Subject: [PATCH 04/23] Doc: List Animated Image as a QML type supported in Qt Quick Designer Change-Id: I3eefe1d70200801639112fb961a1c5c9d6fe161d Reviewed-by: Thomas Hartmann --- doc/src/qtquick/qtquick-components.qdoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc index a28a3af6432..090f031b801 100644 --- a/doc/src/qtquick/qtquick-components.qdoc +++ b/doc/src/qtquick/qtquick-components.qdoc @@ -92,6 +92,9 @@ You can use the following QML types to create components: \list + \li \l [QML]{AnimatedImage}{Animated Image} provides a way to play + animations stored as images containing a series of frames, such + as those stored in GIF files. \li \l [QML]{BorderImage}{Border Image} uses an image as a border or background. \li \l [QML]{Image} adds a bitmap to the scene. You can stretch and From 532c809e861264812a6a1c60e65ff04782f69649 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 8 Apr 2019 16:19:56 +0200 Subject: [PATCH 05/23] Doc: Update screenshot to show the correct export item icon Change-Id: I6545ce2267f4c822249863e22087e5c948936734 Reviewed-by: Leena Miettinen --- doc/images/qmldesigner-export-item.png | Bin 2435 -> 2422 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/doc/images/qmldesigner-export-item.png b/doc/images/qmldesigner-export-item.png index 4dd436149063aff10e358371533c923449745500..6fb8da4f538fc300bf8001c605b85d934eb21b36 100644 GIT binary patch literal 2422 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 T=GJuTF@S)ltDnm{r-UW|R1|ts literal 2435 zcmeAS@N?(olHy`uVBq!ia0y~yVED(tz~IBd%)r1<<@HOJfr05)fKQ04zrVkOlZ#`? zat%!_hmZ{Sq&j;?XJ21GYg>DBb8~GST{{OScTaCyd&jnp4r3D&Cl@y#AD^V8r1<#w zfPerOHxE~L&neSq6c!eSM@G+ExTvS6CoMfAG&I!2&O^i0xvQ(IsHiw0At53n!pq0c z%iCx5+I9UCCw2AoW@Tk%WMl*eg;-eG#3dwoRj-~kXYPy{Gy3}b8k<`33yTtyQXx^(wVOxPRaVzTMMnpRhI@K?Iyt$xR_@=vbJvpPD;6zYY@a=S+O%oieG}>% z8gujV{rqxcVqy(!y)?~Tw%@zGW8eJAlP8x~RF;*OFYCy0@Q#TO2`r8FKXLTfp~FXx z99-vIx?=O%{`Sspb4%+bcb{H7bAHvOQ@i)B((1DU%zwPw(X83 z+qRwFx_;v(r}B**?dv8iTv*aFDLkrWoI)P&F|XO|ThpT^EO-Lv}S zvYp3@=N>Cwc%)*&x{U61GuN)1yI|ph1qd*Cuo7wl!0->nHAA((jqrw`O|R z?#&(ZdOMO!I!>=@OHXWB(_6c`uP7`$LeDv(CpkFW-S6D(7yU;c?Ye*G&Ye5guH0U8 z?MCCqD}}4BT)291$-#?<4xL-S^YqPY$LFp)e*EIWEo=9-EZH+@(w>#acF$h9yKB*| zB}=x?S+K2Y#-@UvO&zm0Jh`zxuVa;C$x6SH<>!tsD{Nj|RlhK_Y*Jo*OL=8=cyhUK zNNGt)$(q)Jrl!2??CfbxSp}Ktu|Ww{nKAhpG1YM~$pQWj&b~DvuEn7)zAi4tW|kUy zrphX+m)?Ip{_)+pmp2+$pP9e+SpVju2ag}@+_bxE;ksRWR;@d_{LeY&C*KTFKzE}Nz?{_#6{wP@{pvTZmWaDxB=?AKJn*5ylzK?m=tnLG` ztwj?#V*WAM-%g(V$29&!GxwxTVmycI?<}gA=g?HlAyieYdA%(E+iPaX2|9j%via&WpXv-nlgm0M9$R~P?eNoA&SUdBcIO|{yzc+Ce>j7B zlc#?$=9_!*VSceZ_jg260RXw0kWS;tfS)Ar{EkEmr6=7cpht@l21gZ!RQSx!jnmUHZ% zcZ=1RxX#Ur*?sOfuXvE0O5-G|i+?RQsk~z2y`7<_cjBgV$GMsm+idq= z+ak16n7w^w6L(`{dwsbv!{PoW5e=!{Ll*Lv)sDZm`SHB{eTA)?WkuSL37nFi!SBvV z?0qg85oUkq=ij$+-|wk0?tB0KPln^t3zPNx#hEzvEozy0!_2=$-ct77?*py2%GcIp&G)#qb4#7o{m+el z5^qi}?=raYcjoaq5o~v^)SbWXt*pG1>&)BL7Zg}sy>?st+;6rgargQEf2!~Qll{9} z_D_;{pwVZ;Ro3#$qLPE}tdm=%tZu)1@n(;k;%~m6|5GRP@Mn0D@Q%{~f<}$nJU{%k zETw)=@!7EE&z&iso*oR0ai8g{77etdEyn50{*3gqrVwu@m7bC=I*~=r_8#;ws)RBc)h7tel^!qgM*5jKkwdp^G<2q>Pp_* z`WaD)jyJiko|;sgV`k@n?0EbAlkwc|n65U=W%%>Brm^@(Iq#lrWiR*WGDmNZyEspw zhVOFjkJr<5IQfb^Uwg-H`g>wy8g+m*jHPw2NzKK-y)Rd~%Im;Wb=RrwpW`JOg& z#N3Pj!J*C4-|FyB;L#cOnrjmmRn&+*VOO-7wfM2ex6h$m$(q&2f|xk63>S%g$#?eI z+nn=pDbM$b2?hd3e*Xzj4xeb@m1NMTmHWgo;Hg{jhmAL)*Q;45#2$(TCT-nCxo?}3+JnB}LfpS7jt>KQTHFTr(RDkBeE z5c=fF;k))-Zm`i#3;B%&nI}18cPveQ(y{%gkh9G8#- z^LVJq-aI3s Date: Mon, 8 Apr 2019 12:56:26 +0200 Subject: [PATCH 06/23] AutoTest: Fix wizard for qbs and cmake If a kit had no Qt configured the wizard for creating GTest projects did not work even for build systems that did not need Qt (Qbs/CMake). Json wizard needs some adaption before fixing this properly, so work around this issue by specifying a common existing "feature". Limiting the wizard for that case to desktop devices does no big harm as the AutoTest plugin is currently limited to desktop anyhow. Fixes: QTCREATORBUG-22264 Change-Id: I7a26f3cbc44762f7eda356128f6c25ca5cee6707 Reviewed-by: Christian Kandeler --- share/qtcreator/templates/wizards/autotest/wizard.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/qtcreator/templates/wizards/autotest/wizard.json b/share/qtcreator/templates/wizards/autotest/wizard.json index d9fe6257af5..64e8b8d6af5 100644 --- a/share/qtcreator/templates/wizards/autotest/wizard.json +++ b/share/qtcreator/templates/wizards/autotest/wizard.json @@ -1,13 +1,13 @@ { "version": 1, - "supportedProjectTypes": [ "Qt4ProjectManager.Qt4Project" ], + "supportedProjectTypes": [ "CMakeProjectManager.CMakeProject", "Qbs.QbsProject", "Qt4ProjectManager.Qt4Project" ], "id": "R.AutoTest", "category": "H.Project", "trDescription": "Creates a new unit test project. Unit tests allow you to verify that the code is fit for use and that there are no regressions.", "trDisplayName": "Auto Test Project", "trDisplayCategory": "Other Project", "icon": "autotest.png", - "featuresRequired": [ "QtSupport.Wizards.FeatureQt", "QtSupport.Wizards.FeatureDesktop" ], + "featuresRequired": [ "QtSupport.Wizards.FeatureDesktop" ], "enabled": "%{JS: [ %{Plugins} ].indexOf('AutoTest') >= 0}", "options": @@ -187,7 +187,7 @@ "enabled": "%{IsTopLevelProject}", "data": { "projectFilePath": "%{ProjectFilePath}", - "requiredFeatures": [ "%{JS: (('%{BuildSystem}' === 'cmake' && '%{TestFrameWork}' === 'QtTest') || '%{TestFrameWork}' === 'QtQuickTest') ? 'QtSupport.Wizards.FeatureQt.5' : 'QtSupport.Wizards.FeatureQt' }" ] + "requiredFeatures": [ "%{JS: ('%{TestFrameWork}' === 'QtQuickTest' ? 'QtSupport.Wizards.FeatureQt.5' : (('%{BuildSystem}' === 'qmake' || '%{TestFrameWork}' === 'QtTest') ? 'QtSupport.Wizards.FeatureQt' : 'DeviceType.Desktop' )) }" ] } }, { From 4e45ca0c9d92bdf1c7b99a5d566484fe8d416e87 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 9 Apr 2019 10:52:45 +0200 Subject: [PATCH 07/23] ProjectExplorer: Fix runtime warning in toolchains settings page We used to get the following when marking a first or second level entry: QStackedWidget::setCurrentWidget: widget 0x0 not contained in stack Change-Id: I2af19bbd767a218171cdaeb5e9bf4a3bf3db15dc Reviewed-by: hjk Reviewed-by: Eike Ziller --- src/plugins/projectexplorer/toolchainoptionspage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp index eff7f3a408e..2e41c8cd420 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.cpp +++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp @@ -317,8 +317,8 @@ void ToolChainOptionsWidget::toolChainSelectionChanged() ToolChainTreeItem *item = currentTreeItem(); QWidget *currentTcWidget = item ? item->widget : nullptr; - - m_widgetStack->setCurrentWidget(currentTcWidget); + if (currentTcWidget) + m_widgetStack->setCurrentWidget(currentTcWidget); m_container->setVisible(currentTcWidget); updateState(); } From 7d08aa3de0adcaf0aaba573e1702b79d542af2da Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 9 Apr 2019 10:53:46 +0200 Subject: [PATCH 08/23] Doc: Add a note about installing Qt Virtual Keyboard You can easily just ignore the check box when using a wizard to create a project, but the main.qml file cannot be opened in the Form Editor if Qt Virtual Keyboard has not been installed. Change-Id: I88355efa3ad28e5485a944865a722e31db372071 Reviewed-by: Thomas Hartmann --- doc/src/qtquick/creator-only/qtquick-creating.qdoc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/src/qtquick/creator-only/qtquick-creating.qdoc b/doc/src/qtquick/creator-only/qtquick-creating.qdoc index cb7ebcd005c..90a6e8d4f5f 100644 --- a/doc/src/qtquick/creator-only/qtquick-creating.qdoc +++ b/doc/src/qtquick/creator-only/qtquick-creating.qdoc @@ -120,6 +120,12 @@ support for \l{http://doc.qt.io/qt-5/qtvirtualkeyboard-index.html} {Qt Virtual Keyboard} to the application. + \note If you have not installed the Qt Virtual Keyboard module when + you installed Qt, an error message will appear when you try to open + the \e main.qml in the \uicontrol {Form Editor} in the Design mode. + You can use the \l {Installing Qt}{Qt Maintenance Tool} to install + Qt Virtual Keyboard. + \li Select \uicontrol Next. \li Select \l{glossary-buildandrun-kit}{kits} for running and building From 712e87c041eff221d910dda59c486260d0906706 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 9 Apr 2019 09:58:56 +0200 Subject: [PATCH 09/23] Update qbs submodule To HEAD of 1.13 branch. Change-Id: I8239e37439398e51a104b730215f3979a9b08fe6 Reviewed-by: Joerg Bornemann --- src/shared/qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/qbs b/src/shared/qbs index e0c6f88fe51..1301eb87fd4 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit e0c6f88fe51186eb6fc697ba74f60136bf2106e4 +Subproject commit 1301eb87fd40d200310365f7553ab4b901a855d8 From 810a39c70611e862e6178bee08666e5a2eab0e32 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 9 Apr 2019 10:49:20 +0200 Subject: [PATCH 10/23] Debugger: Prevent crash on destroyed perspective Change-Id: Id000f1c74c2e614f24df1f50f710e51041fa9c38 Reviewed-by: Eike Ziller Reviewed-by: Christian Stenger --- src/plugins/debugger/debuggermainwindow.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp index 9a661eee81f..598344bb25f 100644 --- a/src/plugins/debugger/debuggermainwindow.cpp +++ b/src/plugins/debugger/debuggermainwindow.cpp @@ -444,7 +444,10 @@ void DebuggerMainWindow::restorePersistentSettings() qCDebug(perspectivesLog) << "LOADED DOCKS:" << theMainWindow->d->m_persistentChangedDocks; + QTC_ASSERT(theMainWindow, return); + QTC_ASSERT(theMainWindow->d, return); for (Perspective *perspective : theMainWindow->d->m_perspectives) { + QTC_ASSERT(perspective, continue); qCDebug(perspectivesLog) << "RESTORING PERSPECTIVE" << perspective->d->m_id; for (DockOperation &op : perspective->d->m_dockOperations) { if (op.operationType != Perspective::Raise) { @@ -477,6 +480,7 @@ void DebuggerMainWindow::savePersistentSettings() QSet changedDocks = theMainWindow->d->m_persistentChangedDocks; for (Perspective *perspective : theMainWindow->d->m_perspectives) { + QTC_ASSERT(perspective, continue); qCDebug(perspectivesLog) << "SAVE PERSPECTIVE" << perspective->d->m_id; for (const DockOperation &op : perspective->d->m_dockOperations) { if (op.operationType != Perspective::Raise) { From 5e7818c48c631cafe055faf106e3c553c7fec9b2 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 9 Apr 2019 11:06:51 +0200 Subject: [PATCH 11/23] QmlProfiler: Don't assert on data from invalid model index When selecting an item that has no equivalent in the statistics view, we should just clear the statistics view's selection. Fixes: QTCREATORBUG-22262 Change-Id: Id43a46859ab33285fdfb1beafe7137e1bbb3b362 Reviewed-by: Christian Stenger --- .../qmlprofiler/qmlprofilerstatisticsview.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp b/src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp index 4bbf8d2c440..d11c97e0854 100644 --- a/src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp @@ -298,13 +298,15 @@ void QmlProfilerStatisticsMainView::displayTypeIndex(int typeIndex) QAbstractItemModel *sourceModel = sortModel->sourceModel(); QTC_ASSERT(sourceModel, return); - QModelIndex sourceIndex = sourceModel->index(qMin(typeIndex, sourceModel->rowCount() - 1), - MainCallCount); - QTC_ASSERT(sourceIndex.data(TypeIdRole).toInt() == typeIndex, return); - - setCurrentIndex(sourceIndex.data(SortRole).toInt() > 0 - ? sortModel->mapFromSource(sourceIndex) - : QModelIndex()); + if (typeIndex < sourceModel->rowCount()) { + QModelIndex sourceIndex = sourceModel->index(typeIndex, MainCallCount); + QTC_ASSERT(sourceIndex.data(TypeIdRole).toInt() == typeIndex, return); + setCurrentIndex(sourceIndex.data(SortRole).toInt() > 0 + ? sortModel->mapFromSource(sourceIndex) + : QModelIndex()); + } else { + setCurrentIndex(QModelIndex()); + } } // show in callers/callees subwindow From 9cd1f4d6d0d9666c660845dd59e2daf1cd60727c Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 9 Apr 2019 11:19:15 +0200 Subject: [PATCH 12/23] PerfProfiler: Update the run actions when creating the tool There might not be a project and therefore, ProjectExplorer might never send the updateRunActions() signal. Fixes: QTCREATORBUG-22256 Change-Id: I2705fb22484b491a7a4985179eb6b5a26a921902 Reviewed-by: Christian Stenger --- src/plugins/perfprofiler/perfprofilertool.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/perfprofiler/perfprofilertool.cpp b/src/plugins/perfprofiler/perfprofilertool.cpp index ff5a171a6f7..4feb8b02794 100644 --- a/src/plugins/perfprofiler/perfprofilertool.cpp +++ b/src/plugins/perfprofiler/perfprofilertool.cpp @@ -169,6 +169,7 @@ PerfProfilerTool::PerfProfilerTool(QObject *parent) : m_delayLabel->setProperty("panelwidget", true); m_perspective.setAboutToActivateCallback([this]() { createViews(); }); + updateRunActions(); } void PerfProfilerTool::createViews() From 9d61f64a6534c33aedd059783ddf78dbe1db87bc Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 9 Apr 2019 12:43:40 +0200 Subject: [PATCH 13/23] Doc: Update information about using the editor toolbar - Add section headings - Describe the context menu for the open file - Add screen shot of the Text Encoding dialog Change-Id: Ic2196855321eee6a8f742cd6dc8f8e316b976cdf Reviewed-by: Eike Ziller --- doc/images/qtcreator-text-encoding.png | Bin 0 -> 12033 bytes doc/src/editors/creator-coding-edit-mode.qdoc | 39 ++++++++++++------ 2 files changed, 27 insertions(+), 12 deletions(-) create mode 100644 doc/images/qtcreator-text-encoding.png diff --git a/doc/images/qtcreator-text-encoding.png b/doc/images/qtcreator-text-encoding.png new file mode 100644 index 0000000000000000000000000000000000000000..1c528e50ec6169ed0863347ba5ff5d121e862141 GIT binary patch literal 12033 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 \uicontrol Options > \uicontrol {Text Editor} > - \uicontrol Display > \uicontrol {Display file encoding}. To change the - encoding, click it on the toolbar and select new encoding in the - \uicontrol {Text Encoding} dialog. To reload the file with the selected - encoding, select \uicontrol {Reload with Encoding}. To save the file with + \uicontrol Display > \uicontrol {Display file encoding}. + + To change the text encoding, click it on the toolbar and select new + encoding in the \uicontrol {Text Encoding} dialog: + + \image qtcreator-text-encoding.png "Text Encoding dialog" + + To reload the file with the selected encoding, select + \uicontrol {Reload with Encoding}. To save the file with the new encoding, select \uicontrol {Save with Encoding}. \endif - \note Other convenient ways of navigating in \QC are provided by the - \l{Searching with the Locator}{locator}, \l{Keyboard Shortcuts} - {keyboard shortcuts}, and the \l{Browsing Project Contents}{sidebar}. - \section1 Splitting the Editor View Split the editor view or open the editor in a new window when you want to From 59d32848083c7a7dc98929749afddfa70ab1c8a6 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 9 Apr 2019 14:45:39 +0200 Subject: [PATCH 14/23] More change log for 4.9.0 Change-Id: Id3dda9811e1dadebc801d7cdfd69dd6a845649ad Reviewed-by: Leena Miettinen --- dist/changes-4.9.0.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dist/changes-4.9.0.md b/dist/changes-4.9.0.md index 7f9892cf01e..ea2d440d182 100644 --- a/dist/changes-4.9.0.md +++ b/dist/changes-4.9.0.md @@ -46,6 +46,7 @@ All Projects (QTCREATORBUG-20577) * Fixed that dragging file from `Projects` view to desktop moved the file (QTCREATORBUG-14494) +* Fixed regression with `QTC_EXTENSION` environment variable QMake Projects @@ -96,11 +97,13 @@ C++ Support * Added option to format code instead of only indenting code * Added `Open Used .clang-format Configuration File` to editor's context menu + * Fixed indentation issue after empty line (QTCREATORBUG-22238) QML Support * Updated to parser from Qt 5.12, adding support for ECMAScript 7 (QTCREATORBUG-20341, QTCREATORBUG-21301) +* Added Qt 5.13 as option to the wizards * Improved error handling in Qt Quick Application project template (QTBUG-39469) * Fixed crash on `Find Usages` @@ -114,15 +117,19 @@ Nim Support Debugging +* Added pretty printing of `QSizePolicy` * Fixed that debugger toolbar could force large minimum window size (QTCREATORBUG-21885) -* Added pretty printing of `QSizePolicy` +* Fixed restoring of debugger layout (QTCREATORBUG-21083) * Fixed pretty printing of standard maps and sets from `libc++` (QTCREATORBUG-18536) * GDB * Added support for rvalue references in function arguments + * Fixed `Break on Abort` with GDB > 8.1 (QTBUG-73993) * LLDB * Fixed `Source Paths Mappings` functionality (QTCREATORBUG-17468) +* QML + * Fixed loading QML stack (QTCREATORBUG-22209) Clang Analyzer Tools @@ -142,6 +149,8 @@ Qt Quick Designer * Made QML Live Preview integration opensource * Added support for `Dialog` (QTCREATORBUG-22120) +* Fixed layout icons (QDS-538) +* Fixed crash when creating item inside `TabView` tab (QTCREATORBUG-21542) Version Control Systems @@ -192,6 +201,7 @@ Windows * Fixed issue with UNC paths in `.pro` files (QTCREATORBUG-21881) * Fixed language version detections with MSVC and precompiled headers (QTCREATORBUG-21860) +* Fixed submenu arrow styling (QTCREATORBUG-21376) Linux From 4bdfaafc4246771bf1cbc87968287f5af5098362 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 9 Apr 2019 12:24:31 +0200 Subject: [PATCH 15/23] Work around OpenGL issue in macOS 10.14.4 Looks like any OpenGL usage crashes on GPU switches, so temporarily turn it off. Task-number: QTCREATORBUG-22215 Change-Id: I26f370f4d94a00fa56da75a32b3ff485ad771864 Reviewed-by: Laszlo Agocs Reviewed-by: Alessandro Portale --- src/app/app-Info.plist | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/app-Info.plist b/src/app/app-Info.plist index 5893f062a8a..2e2614b34a6 100644 --- a/src/app/app-Info.plist +++ b/src/app/app-Info.plist @@ -194,8 +194,6 @@ NSPrincipalClass NSApplication - NSSupportsAutomaticGraphicsSwitching - CFBundleDocumentTypes From 761d8af68b624985360fbb483ecc95e8e6bdb4c4 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 9 Apr 2019 15:45:23 +0200 Subject: [PATCH 16/23] Doc: Add a link to supported JavaScript methods from error message docs Since 4.9, the listed functions are supported in Qt Quick UI forms, but the message text has not been updated. It is translatable, so it will be updated in master. Change-Id: I724ffa72bbd78bf9b8d9b5b5ec2136c2d72859a9 Reviewed-by: Ulf Hermann --- doc/src/editors/creator-code-syntax.qdoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/src/editors/creator-code-syntax.qdoc b/doc/src/editors/creator-code-syntax.qdoc index f38686ed5ee..bf68f1e41a5 100644 --- a/doc/src/editors/creator-code-syntax.qdoc +++ b/doc/src/editors/creator-code-syntax.qdoc @@ -489,7 +489,8 @@ \li M222 \li Error \li Functions are not supported in a Qt Quick UI form. - \li + \li For a list of supported JavaScript functions, see + \l{Supported Methods}. \row \li M223 From fb1ddb53c8301bd081fddbb7429adc03db4d1c95 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 9 Apr 2019 16:44:35 +0200 Subject: [PATCH 17/23] Doc: Describe Stack context menu commands in Qt Quick Designer The Raise and Lower buttons were removed from the toolbar, so describe the respective context-menu commands instead. Change-Id: Iaa00d0b627674f901978404083762e19bb4fb625 Reviewed-by: Thomas Hartmann --- doc/src/qtquick/qtquick-navigator.qdoc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/doc/src/qtquick/qtquick-navigator.qdoc b/doc/src/qtquick/qtquick-navigator.qdoc index 3fe95176474..4092f412110 100644 --- a/doc/src/qtquick/qtquick-navigator.qdoc +++ b/doc/src/qtquick/qtquick-navigator.qdoc @@ -86,13 +86,11 @@ Items with the same stacking value are drawn in the order they are listed, from the last item up. - To raise or lower the stack value of an item, select \inlineimage raise.png - (\uicontrol Raise) or \inlineimage lower.png - (\uicontrol Lower) on the toolbar. - To move an item to the front or back of all its siblings, right-click it in the navigator or the \uicontrol {Form Editor} and select - \uicontrol {Stack (z)}. To remove the \c z property, select + \uicontrol {Stack (z)} > \uicontrol {To Front} or \uicontrol {To Back}. + To raise or lower the stack value of an item, select \uicontrol Raise + or \uicontrol Lower. To remove the \c z property, select \uicontrol {Reset z Property}. You can also use a \uicontrol StackLayout item (Qt Quick Controls) to From 3b30353e4be87ca62fb145fc77a11a4a06af27e5 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 9 Apr 2019 13:47:41 +0200 Subject: [PATCH 18/23] Tracing: Update selection range when timeline width changes The viewTimePerPixel needs to be adapted then. Change-Id: Ie057c780cc75099f1b9df18c79c5e133411ef8e6 Fixes: QTCREATORBUG-22094 Reviewed-by: Christian Kandeler --- src/libs/tracing/qml/MainView.qml | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/libs/tracing/qml/MainView.qml b/src/libs/tracing/qml/MainView.qml index 03e3fceeada..2e1f97a3baa 100644 --- a/src/libs/tracing/qml/MainView.qml +++ b/src/libs/tracing/qml/MainView.qml @@ -55,19 +55,7 @@ Rectangle { onRangeChanged: { zoomSliderToolBar.updateZoomLevel(); content.scroll(); - - // If you select something in the main view and then resize the current range by some - // other means, the selection should stay where it was. - var oldTimePerPixel = selectionRange.viewTimePerPixel; - selectionRange.viewTimePerPixel = zoomControl.rangeDuration / content.width; - if (selectionRange.creationState === selectionRange.creationFinished && - oldTimePerPixel != selectionRange.viewTimePerPixel) { - var newWidth = selectionRange.rangeWidth * oldTimePerPixel / - selectionRange.viewTimePerPixel; - selectionRange.rangeLeft = selectionRange.rangeLeft * oldTimePerPixel / - selectionRange.viewTimePerPixel; - selectionRange.rangeRight = selectionRange.rangeLeft + newWidth; - } + selectionRange.update(); } onWindowChanged: { content.scroll(); @@ -216,6 +204,8 @@ Rectangle { buttonsBar.updateLockButton(selectionLocked); } + onWidthChanged: selectionRange.update(); + onPropagateSelection: { if (lockItemSelection || (newModel === selectedModel && newItem === selectedItem)) return; @@ -314,6 +304,18 @@ Rectangle { root.selectionRangeMode = false; } + function update() { + // If you select something in the main view and then resize the current range by some + // other means, the selection should stay where it was. + var oldTimePerPixel = viewTimePerPixel; + viewTimePerPixel = zoomControl.rangeDuration / content.width; + if (creationState === creationFinished && oldTimePerPixel != viewTimePerPixel) { + var newWidth = rangeWidth * oldTimePerPixel / viewTimePerPixel; + rangeLeft = rangeLeft * oldTimePerPixel / viewTimePerPixel; + rangeRight = rangeLeft + newWidth; + } + } + } } From 0a582f279e1587b857ed770572f83472786e3195 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 9 Apr 2019 16:28:59 +0200 Subject: [PATCH 19/23] Doc: Fix link to icon in Qt Quick Designer docs Instead of the transparency button, the eye-open icon should be clicked to hide items on the canvas. Change-Id: Ica44241a1ea129f24f97cdae58355d14bce79d61 Reviewed-by: Thomas Hartmann --- doc/src/qtquick/qtquick-navigator.qdoc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/src/qtquick/qtquick-navigator.qdoc b/doc/src/qtquick/qtquick-navigator.qdoc index 4092f412110..db8921630cb 100644 --- a/doc/src/qtquick/qtquick-navigator.qdoc +++ b/doc/src/qtquick/qtquick-navigator.qdoc @@ -52,10 +52,9 @@ When you copy an item, all its child items are also copied. When you remove an item, the child items are also removed. - You can show and hide items on the canvas to focus on specific parts of the - application. Click the \inlineimage icon_color_none.png - (\uicontrol Transparent) button to change the visibility of an item on the - canvas. To change the visibility of an item in the application, select the + To show and hide items on the canvas when focusing on specific parts of the + application, click \inlineimage eye_open.png + . To change the visibility of an item in the application code, select the \uicontrol Visibility check box in the \uicontrol Properties pane or select \uicontrol Edit > \uicontrol Visibility in the context menu. From 50522c6e7a28725c0e6556545ded5eedd6bb76c0 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 10 Apr 2019 17:07:32 +0200 Subject: [PATCH 20/23] Fix qbs build of clang format product Not depending on CppEditor caused linker errors regarding the cpp highlighter class. Change-Id: Ib127cbe8e7d8eaa9e7d222dea88585164e49cdd2 Reviewed-by: Christian Kandeler --- src/plugins/clangformat/clangformat.qbs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/clangformat/clangformat.qbs b/src/plugins/clangformat/clangformat.qbs index 3e40832c577..e5510b4630c 100644 --- a/src/plugins/clangformat/clangformat.qbs +++ b/src/plugins/clangformat/clangformat.qbs @@ -5,6 +5,7 @@ QtcPlugin { Depends { name: "Core" } Depends { name: "TextEditor" } + Depends { name: "CppEditor" } Depends { name: "CppTools" } Depends { name: "ProjectExplorer" } Depends { name: "Utils" } From 0a8a9f60e1343d99d0d48e46e294c5bcd1bc300e Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 11 Apr 2019 09:35:22 +0200 Subject: [PATCH 21/23] Debugger: Coordinate breakpoint rampdown The update of the global came too early to properly check the condition whether it is still used. So fully remove usage first, then update, so the check operates on intended data. Fixes: QTCREATORBUG-22284 Change-Id: Iecdbdc371396132c88d0918f7cb253cf2627e0e3 Reviewed-by: Christian Stenger --- src/plugins/debugger/breakhandler.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index 6e0ac9a7ff3..481c123046a 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -2031,14 +2031,18 @@ void BreakHandler::setWatchpointAtExpression(const QString &exp) void BreakHandler::releaseAllBreakpoints() { + GlobalBreakpoints gbps; for (Breakpoint bp : breakpoints()) { bp->removeChildren(); bp->destroyMarker(); - if (GlobalBreakpoint gbp = bp->globalBreakpoint()) - gbp->updateMarker(); + gbps.append(bp->globalBreakpoint()); } clear(); - // The now-unclaimed breakpoints are globally visible again. + // Make now-unclaimed breakpoints globally visible again. + for (GlobalBreakpoint gbp: qAsConst(gbps)) { + if (gbp) + gbp->updateMarker(); + } } QString BreakpointItem::msgWatchpointByExpressionTriggered(const QString &expr) const From 7885bc899f8bd5952e23625dcf105b61bc1a1b38 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 9 Apr 2019 16:34:38 +0200 Subject: [PATCH 22/23] ProjectExplorer: Fix kit duplication in target setup page Do not add a modified kit to the UI if it was already present. Fixes: QTCREATORBUG-21240 Change-Id: Ib4887902402734ce95bde21c26ec9188ee9e55da Reviewed-by: Christian Stenger --- src/plugins/projectexplorer/targetsetuppage.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/plugins/projectexplorer/targetsetuppage.cpp b/src/plugins/projectexplorer/targetsetuppage.cpp index aea75ad9932..501e0efc39a 100644 --- a/src/plugins/projectexplorer/targetsetuppage.cpp +++ b/src/plugins/projectexplorer/targetsetuppage.cpp @@ -382,6 +382,11 @@ void TargetSetupPage::handleKitUpdate(Kit *k) m_importer->makePersistent(k); bool acceptable = !m_requiredPredicate || m_requiredPredicate(k); + const bool wasAcceptable = Utils::contains(m_widgets, [k](const TargetSetupWidget *w) { + return w->kit() == k; + }); + if (acceptable == wasAcceptable) + return; if (!acceptable) removeWidget(k); From 07a5c196c42579538e458990454a657e03e618fb Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 12 Apr 2019 10:45:48 +0200 Subject: [PATCH 23/23] Packaging: Restrict 7zip to 2 threads Otherwise can create out-of-memory situations on 32bit machines with many cores. Change-Id: I7cc862d30079ff0fb11a3c088ae38d73afce4b1e Reviewed-by: Tim Jenssen --- scripts/createDevPackage.py | 2 +- scripts/createDistPackage.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/createDevPackage.py b/scripts/createDevPackage.py index 2bd898a9bd6..1c8b85d1437 100755 --- a/scripts/createDevPackage.py +++ b/scripts/createDevPackage.py @@ -122,7 +122,7 @@ def main(): copy_regexp(build_include_regexp, arguments.build, arguments.target_directory, arguments.verbose) if arguments.sevenzip_target: - subprocess.check_call([arguments.sevenzip, 'a', '-mx9', arguments.sevenzip_target, + subprocess.check_call([arguments.sevenzip, 'a', '-mx9', '-mmt2', arguments.sevenzip_target, os.path.join(arguments.target_directory, '*')]) if __name__ == "__main__": diff --git a/scripts/createDistPackage.py b/scripts/createDistPackage.py index 10207993c17..41c36f9ee97 100755 --- a/scripts/createDistPackage.py +++ b/scripts/createDistPackage.py @@ -58,7 +58,7 @@ def main(): common.codesign(tempdir) # package zip_source = os.path.join(tempdir, '*') if arguments.exclude_toplevel else tempdir - subprocess.check_call([arguments.sevenzip, 'a', + subprocess.check_call([arguments.sevenzip, 'a', '-mmt2', arguments.target_archive, zip_source]) finally: shutil.rmtree(tempdir_base)