From 666cdd754c3b59e9720999de602871bfe300fab7 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 26 Aug 2020 15:23:04 +0200 Subject: [PATCH 01/37] Bump version to 4.13.1 Change-Id: I94246bd22b4868f5c99f334d1360c88ea136d24c Reviewed-by: Eike Ziller --- cmake/QtCreatorIDEBranding.cmake | 4 ++-- qbs/modules/qtc/qtc.qbs | 4 ++-- qtcreator_ide_branding.pri | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index 1ca80571126..89d226541e4 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -1,8 +1,8 @@ #PROJECT_USER_FILE_EXTENSION = .user -set(IDE_VERSION "4.13.0") # The IDE version. +set(IDE_VERSION "4.13.1") # The IDE version. set(IDE_VERSION_COMPAT "4.13.0") # The IDE Compatibility version. -set(IDE_VERSION_DISPLAY "4.13.0") # The IDE display version. +set(IDE_VERSION_DISPLAY "4.13.1") # The IDE display version. set(IDE_COPYRIGHT_YEAR "2020") # The IDE current copyright year. set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation. diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index fc5c04485f4..ce3291cbda9 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -4,10 +4,10 @@ import qbs.FileInfo import "qtc.js" as HelperFunctions Module { - property string qtcreator_display_version: '4.13.0' + property string qtcreator_display_version: '4.13.1' property string ide_version_major: '4' property string ide_version_minor: '13' - property string ide_version_release: '0' + property string ide_version_release: '1' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release diff --git a/qtcreator_ide_branding.pri b/qtcreator_ide_branding.pri index d8abff3d601..ed192fb68a0 100644 --- a/qtcreator_ide_branding.pri +++ b/qtcreator_ide_branding.pri @@ -1,6 +1,6 @@ -QTCREATOR_VERSION = 4.13.0 +QTCREATOR_VERSION = 4.13.1 QTCREATOR_COMPAT_VERSION = 4.13.0 -QTCREATOR_DISPLAY_VERSION = 4.13.0 +QTCREATOR_DISPLAY_VERSION = 4.13.1 QTCREATOR_COPYRIGHT_YEAR = 2020 IDE_DISPLAY_NAME = Qt Creator From 0de1668802f694ece5e2ba546072a445b4e3861b Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 25 Aug 2020 12:07:49 +0200 Subject: [PATCH 02/37] Fix qmake build of unittests This basically continues / amends work done with e1c88116b3. Change-Id: Ia8b3a4694e7fea4c15e344839f87c11fbe8fbbf4 Reviewed-by: hjk Reviewed-by: Christian Kandeler --- src/plugins/coreplugin/corepluginunittestfiles.pri | 2 -- src/plugins/coreplugin/icontext.h | 3 ++- src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp | 2 +- src/plugins/qbsprojectmanager/qbsbuildconfiguration.h | 2 +- src/plugins/qbsprojectmanager/qbsbuildstep.cpp | 2 +- src/plugins/qbsprojectmanager/qbsbuildstep.h | 2 +- src/plugins/qbsprojectmanager/qbscleanstep.cpp | 2 +- src/plugins/qbsprojectmanager/qbscleanstep.h | 2 +- src/plugins/qbsprojectmanager/qbsinstallstep.cpp | 2 +- src/plugins/qbsprojectmanager/qbsinstallstep.h | 2 +- src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp | 6 +++--- src/plugins/qbsprojectmanager/qbsproject.cpp | 1 - src/plugins/qbsprojectmanager/qbsproject.h | 3 ++- .../qmldesigner/assetexporterplugin/assetexporterview.cpp | 2 +- .../qmldesigner/components/formeditor/formeditorwidget.cpp | 2 +- .../qmldesigner/components/formeditor/formeditorwidget.h | 2 +- .../qmldesigner/components/navigator/navigatorview.cpp | 2 +- .../components/timelineeditor/timelinetoolbar.cpp | 2 +- .../components/transitioneditor/transitioneditortoolbar.cpp | 2 +- src/plugins/qmldesigner/documentmanager.cpp | 6 +++--- 20 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/plugins/coreplugin/corepluginunittestfiles.pri b/src/plugins/coreplugin/corepluginunittestfiles.pri index f2ec908f262..891168759a7 100644 --- a/src/plugins/coreplugin/corepluginunittestfiles.pri +++ b/src/plugins/coreplugin/corepluginunittestfiles.pri @@ -2,12 +2,10 @@ DEFINES += CORE_STATIC_LIBRARY HEADERS += \ $$PWD/coreicons.h \ - $$PWD/id.h \ $$PWD/find/ifindfilter.h \ $$PWD/locator/ilocatorfilter.h SOURCES += \ $$PWD/coreicons.cpp \ - $$PWD/id.cpp \ $$PWD/find/ifindfilter.cpp \ $$PWD/locator/ilocatorfilter.cpp diff --git a/src/plugins/coreplugin/icontext.h b/src/plugins/coreplugin/icontext.h index 8884dd31982..792217edb93 100644 --- a/src/plugins/coreplugin/icontext.h +++ b/src/plugins/coreplugin/icontext.h @@ -27,7 +27,8 @@ #include "core_global.h" #include "helpitem.h" -#include "id.h" + +#include #include #include diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp index 33e41c31c74..47500c60cb5 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp @@ -75,7 +75,7 @@ static FilePath defaultBuildDirectory(const FilePath &projectFilePath, const Kit // QbsBuildConfiguration: // --------------------------------------------------------------------------- -QbsBuildConfiguration::QbsBuildConfiguration(Target *target, Core::Id id) +QbsBuildConfiguration::QbsBuildConfiguration(Target *target, Utils::Id id) : BuildConfiguration(target, id) { setConfigWidgetHasFrame(true); diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h index 4f9454ea1c3..a78912cbff7 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h @@ -62,7 +62,7 @@ class QbsBuildConfiguration final : public ProjectExplorer::BuildConfiguration Q_OBJECT friend class ProjectExplorer::BuildConfigurationFactory; - QbsBuildConfiguration(ProjectExplorer::Target *target, Core::Id id); + QbsBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id); ~QbsBuildConfiguration() final; public: diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 062f48e15bf..49f46ae7d11 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -136,7 +136,7 @@ private: // QbsBuildStep: // -------------------------------------------------------------------- -QbsBuildStep::QbsBuildStep(BuildStepList *bsl, Core::Id id) : +QbsBuildStep::QbsBuildStep(BuildStepList *bsl, Utils::Id id) : BuildStep(bsl, id) { setDisplayName(tr("Qbs Build")); diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.h b/src/plugins/qbsprojectmanager/qbsbuildstep.h index d257662bdb2..cdb0f94b1dc 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.h +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.h @@ -51,7 +51,7 @@ public: ExpandVariables }; - QbsBuildStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); + QbsBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id); ~QbsBuildStep() override; QVariantMap qbsConfiguration(VariableHandling variableHandling) const; diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.cpp b/src/plugins/qbsprojectmanager/qbscleanstep.cpp index 44d33728960..ecfb16f48cc 100644 --- a/src/plugins/qbsprojectmanager/qbscleanstep.cpp +++ b/src/plugins/qbsprojectmanager/qbscleanstep.cpp @@ -49,7 +49,7 @@ namespace Internal { // QbsCleanStep: // -------------------------------------------------------------------- -QbsCleanStep::QbsCleanStep(BuildStepList *bsl, Core::Id id) +QbsCleanStep::QbsCleanStep(BuildStepList *bsl, Utils::Id id) : BuildStep(bsl, id) { setDisplayName(tr("Qbs Clean")); diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.h b/src/plugins/qbsprojectmanager/qbscleanstep.h index 81a51351da7..d3afdf6b3e7 100644 --- a/src/plugins/qbsprojectmanager/qbscleanstep.h +++ b/src/plugins/qbsprojectmanager/qbscleanstep.h @@ -41,7 +41,7 @@ class QbsCleanStep : public ProjectExplorer::BuildStep Q_OBJECT public: - QbsCleanStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); + QbsCleanStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id); ~QbsCleanStep() override; QbsBuildStepData stepData() const; diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp index 9ad460e48e5..86f0368422b 100644 --- a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp @@ -87,7 +87,7 @@ private: // QbsInstallStep: // -------------------------------------------------------------------- -QbsInstallStep::QbsInstallStep(BuildStepList *bsl, Core::Id id) +QbsInstallStep::QbsInstallStep(BuildStepList *bsl, Utils::Id id) : BuildStep(bsl, id) { setDisplayName(tr("Qbs Install")); diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.h b/src/plugins/qbsprojectmanager/qbsinstallstep.h index 1a0a418fc37..995f8c8536e 100644 --- a/src/plugins/qbsprojectmanager/qbsinstallstep.h +++ b/src/plugins/qbsprojectmanager/qbsinstallstep.h @@ -41,7 +41,7 @@ class QbsInstallStep : public ProjectExplorer::BuildStep Q_OBJECT public: - QbsInstallStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); + QbsInstallStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id); ~QbsInstallStep() override; QString installRoot() const; diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp index e7de4830aae..c0170558d71 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp +++ b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp @@ -164,9 +164,9 @@ void QbsProfilesSettingsWidget::refreshKitsList() m_ui.propertiesView->setModel(nullptr); m_model.reload(); m_ui.profileValueLabel->clear(); - Core::Id currentId; + Utils::Id currentId; if (m_ui.kitsComboBox->count() > 0) - currentId = Core::Id::fromSetting(m_ui.kitsComboBox->currentData()); + currentId = Utils::Id::fromSetting(m_ui.kitsComboBox->currentData()); m_ui.kitsComboBox->clear(); int newCurrentIndex = -1; QList validKits = KitManager::kits(); @@ -192,7 +192,7 @@ void QbsProfilesSettingsWidget::displayCurrentProfile() m_ui.propertiesView->setModel(nullptr); if (m_ui.kitsComboBox->currentIndex() == -1) return; - const Core::Id kitId = Core::Id::fromSetting(m_ui.kitsComboBox->currentData()); + const Utils::Id kitId = Utils::Id::fromSetting(m_ui.kitsComboBox->currentData()); const Kit * const kit = KitManager::kit(kitId); QTC_ASSERT(kit, return); const QString profileName = QbsProfileManager::ensureProfileForKit(kit); diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index f45083fe8a7..ba15c006754 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/src/plugins/qbsprojectmanager/qbsproject.h b/src/plugins/qbsprojectmanager/qbsproject.h index 13f9803c254..4786f36981b 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.h +++ b/src/plugins/qbsprojectmanager/qbsproject.h @@ -35,6 +35,7 @@ #include #include +#include #include #include @@ -92,7 +93,7 @@ public: const QString &filePath, const QString &newFilePath) final; QStringList filesGeneratedFrom(const QString &sourceFile) const final; - QVariant additionalData(Core::Id id) const final; + QVariant additionalData(Utils::Id id) const final; bool isProjectEditable() const; bool addFilesToProduct(const QStringList &filePaths, diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp index fbb4173249f..e651599b80e 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp @@ -62,7 +62,7 @@ bool AssetExporterView::loadQmlFile(const Utils::FilePath &path, uint timeoutSec setState(LoadState::Busy); m_retryCount = std::max(MinRetry, static_cast((timeoutSecs * 1000) / RetryIntervalMs)); - m_currentEditor = Core::EditorManager::openEditor(path.toString(), Core::Id(), + m_currentEditor = Core::EditorManager::openEditor(path.toString(), Utils::Id(), Core::EditorManager::DoNotMakeVisible); Core::ModeManager::activateMode(Core::Constants::MODE_DESIGN); Core::ModeManager::setFocusToCurrentMode(); diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp index 74fa9d3b730..c09516cbf83 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp @@ -283,7 +283,7 @@ void FormEditorWidget::changeBackgound(const QColor &color) } } -void FormEditorWidget::registerActionAsCommand(QAction *action, Core::Id id, const QKeySequence &keysequence) +void FormEditorWidget::registerActionAsCommand(QAction *action, Utils::Id id, const QKeySequence &keysequence) { Core::Context context(Constants::C_QMLFORMEDITOR); diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.h b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.h index b2f50de6c0f..b32c95916a9 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.h +++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.h @@ -97,7 +97,7 @@ private: void changeRootItemWidth(const QString &widthText); void changeRootItemHeight(const QString &heightText); void changeBackgound(const QColor &color); - void registerActionAsCommand(QAction *action, Core::Id id, const QKeySequence &keysequence); + void registerActionAsCommand(QAction *action, Utils::Id id, const QKeySequence &keysequence); QPointer m_formEditorView; QPointer m_graphicsView; diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index e9a4930a446..2058aef198b 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -321,7 +321,7 @@ void NavigatorView::changeToComponent(const QModelIndex &index) const ModelNode doubleClickNode = modelNodeForIndex(index); if (doubleClickNode.metaInfo().isFileComponent()) Core::EditorManager::openEditor(doubleClickNode.metaInfo().componentFileName(), - Core::Id(), Core::EditorManager::DoNotMakeVisible); + Utils::Id(), Core::EditorManager::DoNotMakeVisible); } } diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp index 7d11f57cb39..60ca96e93e8 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp @@ -84,7 +84,7 @@ static int controlWidth(QToolBar *bar, QObject *control) return 0; } -static QAction *createAction(const Core::Id &id, +static QAction *createAction(const Utils::Id &id, const QIcon &icon, const QString &name, const QKeySequence &shortcut) diff --git a/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp b/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp index af19629234d..726472d149f 100644 --- a/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp +++ b/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp @@ -85,7 +85,7 @@ static int controlWidth(QToolBar *bar, QObject *control) return 0; } -static QAction *createAction(const Core::Id &id, +static QAction *createAction(const Utils::Id &id, const QIcon &icon, const QString &name, const QKeySequence &shortcut) diff --git a/src/plugins/qmldesigner/documentmanager.cpp b/src/plugins/qmldesigner/documentmanager.cpp index e1ebfc0a3ff..4550d8a4ea4 100644 --- a/src/plugins/qmldesigner/documentmanager.cpp +++ b/src/plugins/qmldesigner/documentmanager.cpp @@ -110,7 +110,7 @@ static void openFileComponent(const ModelNode &modelNode) { QmlDesignerPlugin::instance()->viewManager().nextFileIsCalledInternally(); Core::EditorManager::openEditor(modelNode.metaInfo().componentFileName(), - Core::Id(), Core::EditorManager::DoNotMakeVisible); + Utils::Id(), Core::EditorManager::DoNotMakeVisible); } static void openFileComponentForDelegate(const ModelNode &modelNode) @@ -136,7 +136,7 @@ static void openComponentSourcePropertyOfLoader(const ModelNode &modelNode) componentModelNode = modelNode.nodeListProperty("component").toModelNodeList().constFirst(); } - Core::EditorManager::openEditor(componentModelNode.metaInfo().componentFileName(), Core::Id(), Core::EditorManager::DoNotMakeVisible); + Core::EditorManager::openEditor(componentModelNode.metaInfo().componentFileName(), Utils::Id(), Core::EditorManager::DoNotMakeVisible); } static void openSourcePropertyOfLoader(const ModelNode &modelNode) @@ -146,7 +146,7 @@ static void openSourcePropertyOfLoader(const ModelNode &modelNode) QString componentFileName = modelNode.variantProperty("source").value().toString(); QFileInfo fileInfo(modelNode.model()->fileUrl().toLocalFile()); - Core::EditorManager::openEditor(fileInfo.absolutePath() + "/" + componentFileName, Core::Id(), Core::EditorManager::DoNotMakeVisible); + Core::EditorManager::openEditor(fileInfo.absolutePath() + "/" + componentFileName, Utils::Id(), Core::EditorManager::DoNotMakeVisible); } From ce19b108d13c3f5bcace01005e482fa3edcddb0d Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 26 Aug 2020 16:51:27 +0200 Subject: [PATCH 03/37] Doc: Add the folder where the Qt Bridge installers are found The installers are copied to the QtDesignStudio folder by the Qt online installer. Task-number: QDS-2542 Change-Id: Ib5e9bbb3c7a2cf03a4abd3e8b39759173a37ad5a Reviewed-by: Vikas Pachdha --- .../src/qtbridge/qtbridge-overview.qdoc | 10 ++++++---- .../src/qtbridge/qtbridge-ps-setup.qdoc | 20 +++++++++++++------ .../src/qtbridge/qtbridge-sketch-setup.qdoc | 8 +++++--- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc index 58e782c2ae5..4a11c64fc14 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc @@ -30,15 +30,17 @@ \title Exporting Artwork from Design Tools - You need to use \QB to first export 2D assets from design tools and then use - \QB to \l{Importing Designs}{import} them into \QDS. + You need to use \QB to first export 2D assets from design tools and then to + \l{Importing Designs}{import} them into \QDS. When working with 3D assets, you can use the export functions provided by the 3D graphics tools to save the assets in widely-used 3D graphics formats, and then use \QB to import them into \QDS. - You can use the Qt online installer to install \QB if you have a license, or - download \QB from the \l{https://marketplace.qt.io/}{Qt Marketplace}. + You can use the Qt online installer to install \QB if you have a commercial + \QDS license. You can also purchase a \QB license separately from the + \l{https://marketplace.qt.io/}{Qt Marketplace} and then install \QB using + the Qt online installer. For best results when importing assets, follow the guidelines for creating and exporting them. diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc index 6af3a302741..a2cde853b15 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc @@ -30,8 +30,12 @@ \title Setting Up \QBPS - You can download \QBPS from the \l{https://marketplace.qt.io/} - {Qt Marketplace}. It is delivered as an Adobe extension (ZXP) + You can purchase a \QBPS license from the \l{https://marketplace.qt.io/} + {Qt Marketplace}, and then use the Qt online installer to have the \QBPS + installation package copied to the following path in your Qt installation + folder: \c {QtDesignStudio\photoshop_bridge}. + + \QBPS is delivered as an Adobe extension (ZXP) package and requires Adobe Photoshop version 20.0.0, or later to be installed. The \QBPS installation process differs depending on whether you use ZXPInstaller and whether you are installing on @@ -44,7 +48,8 @@ \list 1 \li Download and install \l{http://zxpinstaller.com/}{ZXPInstaller}. \li Start ZXPInstaller. - \li Drag and drop the \QBPS ZXP package to ZXPInstaller. + \li Drag and drop the \QBPS ZXP package from + \c {Qt\QtDesignStudio\photoshop_bridge} to ZXPInstaller. \li Follow the instructions of the installation program. \endlist @@ -58,8 +63,9 @@ To install \QBPS on Windows without using ZXPInstaller: \list 1 - \li Copy the \QBPS ZXP package to the \c Documents directory in your - user directory. + \li Copy the \QBPS ZXP package from + \c {Qt\QtDesignStudio\photoshop_bridge} to the + \c Documents directory in your user directory. \li Open Windows PowerShell. \li Enter the following commands: \badcode @@ -75,7 +81,9 @@ To install \QBPS on \macos without using ZXPInstaller: \list 1 - \li Copy the \QBPS ZXP package to your \c Documents directory. + \li Copy the \QBPS ZXP package from + \c {Qt/QtDesignStudio/photoshop_bridge} + to your \c Documents directory. \li Open Terminal. \li Enter the following commands: \badcode diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc index 793f59f574a..dcf7e15730b 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc @@ -30,9 +30,11 @@ \title Setting Up \QBSK - You can download \QBSK from the \l{https://marketplace.qt.io/} - {Qt Marketplace}. It is delivered as a Sketch plugin that you - can install to Sketch. + You can purchase a \QBSK license from the \l{https://marketplace.qt.io/} + {Qt Marketplace}, and then use the Qt online installer to have the \QBSK + installation package copied to the following path in your Qt installation + folder: \c {QtDesignStudio\sketch_bridge}. You can use the installation + package to install the \QBSK plugin to Sketch. \note Install the Sketch app before installing the plugin. From 4f2a21541e67934512cc9b34d59824bc17c43013 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 26 Aug 2020 14:59:45 +0200 Subject: [PATCH 04/37] Debugger: Fix environment passed to inferior by gdb We must not set variables that the user disabled. Change-Id: I2f559aefd6aaa43298dd9c4889a614a5130622c0 Reviewed-by: hjk --- src/plugins/debugger/gdb/gdbengine.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 8ec83467b6c..8a073727ee1 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -3801,10 +3801,12 @@ void GdbEngine::setEnvironmentVariables() // imitate the weird windows gdb behavior of setting the case of the path environment // variable name to an all uppercase PATH const QString name = isWindowsPath(item.name) ? "PATH" : item.name; - if (item.operation == EnvironmentItem::Unset) + if (item.operation == EnvironmentItem::Unset + || item.operation == EnvironmentItem::SetDisabled) { runCommand({"unset environment " + name}); - else + } else { runCommand({"-gdb-set environment " + name + '=' + item.value}); + } } } From 151373396fc52de763eff05da0b0071130f521db Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 26 Aug 2020 14:30:43 +0200 Subject: [PATCH 05/37] QbsProjectManager: Fix install step We got the install command name wrong, which caused the installation to fail. In addition, we forgot to add handling for the "protocol-error" message from qbs, so the step was hanging, rather than aborting. Finally, we triggered a number of assertions in BuildStep::buildConfiguration(). This went all unnoticed for a while, because the install step is not enabled by default these days. Change-Id: I906e7e472563d4ad8fc7557bd706a7cb67f9f2ba Reviewed-by: hjk --- src/plugins/projectexplorer/buildstep.cpp | 8 +++++--- src/plugins/qbsprojectmanager/qbsinstallstep.cpp | 8 ++++---- src/plugins/qbsprojectmanager/qbssession.cpp | 11 ++++++++++- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp index 39a2e647fdc..ad93d4bf4b2 100644 --- a/src/plugins/projectexplorer/buildstep.cpp +++ b/src/plugins/projectexplorer/buildstep.cpp @@ -265,9 +265,11 @@ QString BuildStep::fallbackWorkingDirectory() const void BuildStep::setupOutputFormatter(OutputFormatter *formatter) { - for (const Utils::Id id : buildConfiguration()->customParsers()) { - if (Internal::CustomParser * const parser = Internal::CustomParser::createFromId(id)) - formatter->addLineParser(parser); + if (qobject_cast(parent()->parent())) { + for (const Utils::Id id : buildConfiguration()->customParsers()) { + if (Internal::CustomParser * const parser = Internal::CustomParser::createFromId(id)) + formatter->addLineParser(parser); + } } Utils::FileInProjectFinder fileFinder; fileFinder.setProjectDirectory(project()->projectDirectory()); diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp index 86f0368422b..f7206c70281 100644 --- a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp @@ -109,16 +109,16 @@ QbsInstallStep::~QbsInstallStep() bool QbsInstallStep::init() { - QTC_ASSERT(!buildSystem()->isParsing() && !m_session, return false); + QTC_ASSERT(!target()->buildSystem()->isParsing() && !m_session, return false); return true; } void QbsInstallStep::doRun() { - m_session = static_cast(buildSystem())->session(); + m_session = static_cast(target()->buildSystem())->session(); QJsonObject request; - request.insert("type", "install"); + request.insert("type", "install-project"); request.insert("install-root", installRoot()); request.insert("clean-install-root", m_cleanInstallRoot); request.insert("keep-going", m_keepGoing); @@ -153,7 +153,7 @@ QString QbsInstallStep::installRoot() const const QbsBuildConfiguration *QbsInstallStep::buildConfig() const { - return static_cast(buildConfiguration()); + return static_cast(target()->activeBuildConfiguration()); } bool QbsInstallStep::fromMap(const QVariantMap &map) diff --git a/src/plugins/qbsprojectmanager/qbssession.cpp b/src/plugins/qbsprojectmanager/qbssession.cpp index f03b4176efb..361109db67d 100644 --- a/src/plugins/qbsprojectmanager/qbssession.cpp +++ b/src/plugins/qbsprojectmanager/qbssession.cpp @@ -267,7 +267,7 @@ QString QbsSession::errorString(QbsSession::Error error) case Error::QbsFailedToStart: return tr("The qbs process failed to start."); case Error::ProtocolError: - return tr("The qbs process sent invalid data."); + return tr("The qbs process sent unexpected data."); case Error::VersionMismatch: return tr("The qbs API level is not compatible with what Qt Creator expects."); } @@ -534,6 +534,15 @@ void QbsSession::handlePacket(const QJsonObject &packet) } else if (type == "run-environment") { d->reply = packet; d->eventLoop.quit(); + } else if (type == "protocol-error") { + const ErrorInfo errorInfo = ErrorInfo(packet.value("error").toObject()); + + // TODO: This loop occurs a lot. Factor it out. + for (const ErrorInfoItem &item : errorInfo.items) { + TaskHub::addTask(BuildSystemTask(Task::Error, item.description, + item.filePath, item.line)); + } + setError(Error::ProtocolError); } } From acdb971048652b49941f3d4c009a5cadf466047c Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 21 Aug 2020 16:44:04 +0200 Subject: [PATCH 06/37] QmlDesigner: Add suffux to invalid ids Instead of replacing them with "element" add a suffix. Change-Id: Idc72ba9a8a7b4f48d4e325378b975cafeab88bd4 Reviewed-by: Miikka Heikkinen Reviewed-by: Marco Bubke --- .../qmldesigner/designercore/model/abstractview.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp index 3be64be127d..f5ef94f6216 100644 --- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp +++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp @@ -508,9 +508,13 @@ QString AbstractView::generateNewId(const QString &prefixName) const { QString fixedPrefix = firstCharToLower(prefixName); fixedPrefix.remove(' '); + + bool forceSuffix = false; + if (!ModelNode::isValidId(fixedPrefix)) - return generateNewId("element"); - int counter = 1; + forceSuffix = true; + + int counter = 0; /* First try just the prefixName without number as postfix, then continue with 2 and further as postfix * until id does not already exist. @@ -520,11 +524,14 @@ QString AbstractView::generateNewId(const QString &prefixName) const */ QString newId = QString(QStringLiteral("%1")).arg(firstCharToLower(prefixName)); + if (forceSuffix) + QString(QStringLiteral("%1%2")).arg(firstCharToLower(prefixName)).arg(1); + newId.remove(QRegExp(QStringLiteral("[^a-zA-Z0-9_]"))); while (!ModelNode::isValidId(newId) || hasId(newId) || rootModelNode().hasProperty(newId.toUtf8()) || newId == "item") { counter += 1; - newId = QString(QStringLiteral("%1%2")).arg(firstCharToLower(prefixName)).arg(counter - 1); + newId = QString(QStringLiteral("%1%2")).arg(firstCharToLower(prefixName)).arg(counter); newId.remove(QRegExp(QStringLiteral("[^a-zA-Z0-9_]"))); } From e2e2c462064e4c31ff9ad95dfbd3dd781e325d32 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 20 Aug 2020 17:32:28 +0200 Subject: [PATCH 07/37] QmlDesigner: Avoid visual artefacts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoid visual artefacts when changing states. Change-Id: I00aa1499ff027d060b06699b60ebd2d5162d0e16 Reviewed-by: Henning Gründl Reviewed-by: Thomas Hartmann --- .../qmldesigner/components/formeditor/formeditorview.cpp | 9 +++++++-- .../qmldesigner/components/formeditor/formeditorview.h | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index 96dda07c51c..1a9f1654834 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -234,12 +234,12 @@ void FormEditorView::createFormEditorWidget() connect(m_formEditorWidget->resetAction(), &QAction::triggered, this, &FormEditorView::resetNodeInstanceView); } -void FormEditorView::temporaryBlockView() +void FormEditorView::temporaryBlockView(int duration) { m_formEditorWidget->graphicsView()->setUpdatesEnabled(false); static auto timer = new QTimer(qApp); timer->setSingleShot(true); - timer->start(1000); + timer->start(duration); connect(timer, &QTimer::timeout, this, [this]() { m_formEditorWidget->graphicsView()->setUpdatesEnabled(true); @@ -496,6 +496,11 @@ void FormEditorView::customNotification(const AbstractView * /*view*/, const QSt m_formEditorWidget->zoomAction()->zoomOut(); } +void FormEditorView::currentStateChanged(const ModelNode & /*node*/) +{ + temporaryBlockView(100); +} + AbstractFormEditorTool *FormEditorView::currentTool() const { return m_currentTool; diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.h b/src/plugins/qmldesigner/components/formeditor/formeditorview.h index d6a479e8472..64c1f2a4357 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.h +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.h @@ -84,7 +84,12 @@ public: void documentMessagesChanged(const QList &errors, const QList &warnings) override; - void customNotification(const AbstractView *view, const QString &identifier, const QList &nodeList, const QList &data) override; + void customNotification(const AbstractView *view, + const QString &identifier, + const QList &nodeList, + const QList &data) override; + + void currentStateChanged(const ModelNode &node) override; // FormEditorView WidgetInfo widgetInfo() override; @@ -134,7 +139,7 @@ private: void removeNodeFromScene(const QmlItemNode &qmlItemNode); void hideNodeFromScene(const QmlItemNode &qmlItemNode); void createFormEditorWidget(); - void temporaryBlockView(); + void temporaryBlockView(int duration = 1000); void resetNodeInstanceView(); QPointer m_formEditorWidget; From aa055e74dc30c2f34edaf3e03f47710ac7244ddb Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 21 Aug 2020 16:43:33 +0200 Subject: [PATCH 08/37] QmlDesigner: Change default zoom level for transition editor Change-Id: Ibc120298cdb766e5ff53fa3b7fda40db7d89650b Reviewed-by: Thomas Hartmann --- .../components/transitioneditor/transitioneditorwidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorwidget.cpp b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorwidget.cpp index 5d27b4c9699..87133e68614 100644 --- a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorwidget.cpp +++ b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorwidget.cpp @@ -325,7 +325,7 @@ void TransitionEditorWidget::init() m_graphicsScene->setWidth(m_graphicsView->viewport()->width()); - m_toolbar->setScaleFactor(0); + m_toolbar->setScaleFactor(40); m_toolbar->setCurrentTransition(transition); @@ -335,7 +335,7 @@ void TransitionEditorWidget::init() m_toolbar->setDuration(duration); - m_graphicsScene->setRulerScaling(0); + m_graphicsScene->setRulerScaling(40); } void TransitionEditorWidget::updateData(const ModelNode &transition) From ea20e6c0a8d9cf18e5546fceaf353ee08a65c4e1 Mon Sep 17 00:00:00 2001 From: Aleksei German Date: Mon, 17 Aug 2020 14:10:01 +0200 Subject: [PATCH 09/37] QmlDesigner: Fix for Rich Text Editor - Fixed tables style - Added border around color selector button Task: QDS-2634 Change-Id: I5a164fedaefa87f394c7815a5bb416ec7898417e Reviewed-by: Thomas Hartmann --- .../richtexteditor/richtexteditor.cpp | 41 ++++++++++++++++--- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp b/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp index af04bb676a4..f0cafc892d3 100644 --- a/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp +++ b/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp @@ -38,6 +38,8 @@ #include #include #include +#include +#include #include @@ -85,6 +87,27 @@ static void cursorEditBlock(QTextCursor& cursor, std::function f) { cursor.endEditBlock(); } +static QPixmap drawColorBox(const QColor& color, const QSize& size, int borderWidth = 4) +{ + if (size.isEmpty()) { + return {}; + } + + QPixmap result(size); + + const QColor borderColor = QApplication::palette("QWidget").color(QPalette::Normal, + QPalette::Button); + + result.fill(color); + QPainter painter(&result); + QPen pen(borderColor); + pen.setWidth(borderWidth); + painter.setPen(pen); + painter.drawRect(QRect(QPoint(0,0), size)); + + return result; +} + RichTextEditor::RichTextEditor(QWidget *parent) : QWidget(parent) , ui(new Ui::RichTextEditor) @@ -214,8 +237,7 @@ void RichTextEditor::fontChanged(const QFont &f) void RichTextEditor::colorChanged(const QColor &c) { - QPixmap colorBox(ui->tableBar->iconSize()); - colorBox.fill(c); + QPixmap colorBox(drawColorBox(c, ui->tableBar->iconSize())); m_actionTextColor->setIcon(colorBox); } @@ -436,8 +458,7 @@ void RichTextEditor::setupListActions() void RichTextEditor::setupFontActions() { - QPixmap colorBox(ui->tableBar->iconSize()); - colorBox.fill(ui->textEdit->textColor()); + QPixmap colorBox(drawColorBox(ui->textEdit->textColor(), ui->tableBar->iconSize())); m_actionTextColor = ui->toolBar->addAction(colorBox, tr("&Color..."), [this]() { QColor col = QColorDialog::getColor(ui->textEdit->textColor(), this); @@ -507,7 +528,17 @@ void RichTextEditor::setupTableActions() m_actionCreateTable = ui->tableBar->addAction(createTableIcon, tr("Create Table"), [this]() { QTextCursor cursor = ui->textEdit->textCursor(); cursorEditBlock(cursor, [&] () { - cursor.insertTable(1,1); + //format table cells to look a bit better: + QTextTableFormat tableFormat; + tableFormat.setBorderCollapse(true); + tableFormat.setCellSpacing(2.0); + tableFormat.setCellPadding(2.0); + tableFormat.setBorder(1.0); + + cursor.insertTable(1, 1, tableFormat); + + //move cursor into the first cell of the table: + ui->textEdit->setTextCursor(cursor); }); }); m_actionCreateTable->setCheckable(false); From d235a6d80728d605fc745f0a45d700b8ac3ba8c7 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Thu, 20 Aug 2020 16:38:05 +0200 Subject: [PATCH 10/37] QmlDesigner: Fix focus on EditableListView * Add an enum to the StudioControls ComboBox to indicate type of interaction * Force focus on last used ComboBox if activated signal wasn't send due to editing of the ComboBoxInput Task-number: QDS-2626 Change-Id: I20b1660a05923baacef30f91080642baacee0378 Reviewed-by: Miikka Heikkinen Reviewed-by: Thomas Hartmann --- .../imports/HelperWidgets/EditableListView.qml | 9 ++++++++- .../imports/StudioControls/ComboBox.qml | 10 +++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml index c3344fcfe02..7fc3c9f3f2f 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml @@ -53,6 +53,8 @@ Rectangle { property string typeFilter: "QtQuick3D.Material" + property int activatedReason: ComboBox.ActivatedReason.Other + color: "transparent" border.color: StudioTheme.Values.themeControlOutline border.width: StudioTheme.Values.border @@ -89,11 +91,13 @@ Rectangle { } onCompressedActivated: { + editableListView.activatedReason = reason + if (itemFilterComboBox.empty && itemFilterComboBox.editText !== "") { myRepeater.dirty = false editableListView.add(itemFilterComboBox.editText) } else { - editableListView.replace(myIndex, itemFilterComboBox.editText) + editableListView.replace(itemFilterComboBox.myIndex, itemFilterComboBox.editText) } } } @@ -156,6 +160,9 @@ Rectangle { myColumn.currentIndex = lastIndex else myColumn.currentIndex = myRepeater.localModel.length - 1 + + if (editableListView.activatedReason === ComboBox.ActivatedReason.Other) + myColumn.currentItem.forceActiveFocus() } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml index 1c3dc46c15f..449a40432a1 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml @@ -46,7 +46,9 @@ T.ComboBox { property alias textInput: comboBoxInput - signal compressedActivated(int index) + signal compressedActivated(int index, int reason) + + enum ActivatedReason { EditingFinished, Other } width: StudioTheme.Values.squareComponentWidth * 5 height: StudioTheme.Values.height @@ -81,7 +83,8 @@ T.ComboBox { if (myComboBox.dirty) { myTimer.stop() myComboBox.dirty = false - myComboBox.compressedActivated(myComboBox.find(myComboBox.editText)) + myComboBox.compressedActivated(myComboBox.find(myComboBox.editText), + ComboBox.ActivatedReason.EditingFinished) } } onTextEdited: myComboBox.dirty = true @@ -114,7 +117,8 @@ T.ComboBox { repeat: false running: false interval: 100 - onTriggered: myComboBox.compressedActivated(myTimer.activatedIndex) + onTriggered: myComboBox.compressedActivated(myTimer.activatedIndex, + ComboBox.ActivatedReason.Other) } onActivated: { From ac5d35a53d81212b8ca99af792f312d336e2f087 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Thu, 20 Aug 2020 18:28:33 +0200 Subject: [PATCH 11/37] QmlDesigner: Remove parent as Connections target Task-number: QDS-2651 Change-Id: Ib4520206cc2a3f8a044a66e3e01db0ec603a3029 Reviewed-by: Thomas Hartmann --- .../connectioneditor/connectionmodel.cpp | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp index 04c6c343dc5..2fd2364596c 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp @@ -268,15 +268,11 @@ ModelNode ConnectionModel::getTargetNodeForConnection(const ModelNode &connectio const QString bindExpression = bindingProperty.expression(); if (bindingProperty.isValid()) { - if (bindExpression == QLatin1String("parent")) { - result = connection.parentProperty().parentModelNode(); - } else if (bindExpression.contains(".")) { + if (bindExpression.contains(".")) { QStringList substr = bindExpression.split("."); const QString itemId = substr.constFirst(); if (substr.size() > 1) { - const ModelNode aliasParent = (itemId == QLatin1String("parent") - ? connection.parentProperty().parentModelNode() - : connectionView()->modelNodeForId(itemId)); + const ModelNode aliasParent = connectionView()->modelNodeForId(itemId); substr.removeFirst(); //remove id, only alias pieces left const QString aliasBody = substr.join("."); if (aliasParent.isValid() && aliasParent.hasBindingProperty(aliasBody.toUtf8())) { @@ -303,7 +299,7 @@ void ConnectionModel::addConnection() NodeMetaInfo nodeMetaInfo = connectionView()->model()->metaInfo("QtQuick.Connections"); if (nodeMetaInfo.isValid()) { - connectionView()->executeInTransaction("ConnectionModel::addConnection", [=](){ + connectionView()->executeInTransaction("ConnectionModel::addConnection", [=, &rootModelNode](){ ModelNode newNode = connectionView()->createModelNode("QtQuick.Connections", nodeMetaInfo.majorVersion(), nodeMetaInfo.minorVersion()); @@ -316,19 +312,14 @@ void ConnectionModel::addConnection() else rootModelNode.nodeAbstractProperty(rootModelNode.metaInfo().defaultPropertyName()).reparentHere(newNode); - if (QmlItemNode(selectedNode).isFlowActionArea()) - source = selectedNode.validId() + ".trigger()"; - - if (QmlVisualNode(selectedNode).isFlowTransition()) + if (QmlItemNode(selectedNode).isFlowActionArea() || QmlVisualNode(selectedNode).isFlowTransition()) source = selectedNode.validId() + ".trigger()"; if (!connectionView()->selectedModelNodes().constFirst().id().isEmpty()) - newNode.bindingProperty("target").setExpression(selectedNode.id()); - else - newNode.bindingProperty("target").setExpression(QLatin1String("parent")); + newNode.bindingProperty("target").setExpression(selectedNode.validId()); } else { rootModelNode.nodeAbstractProperty(rootModelNode.metaInfo().defaultPropertyName()).reparentHere(newNode); - newNode.bindingProperty("target").setExpression(QLatin1String("parent")); + newNode.bindingProperty("target").setExpression(rootModelNode.validId()); } newNode.signalHandlerProperty("onClicked").setSource(source); From f642c02eb651b8146c57f735e03e4db29078abca Mon Sep 17 00:00:00 2001 From: Aleksei German Date: Tue, 28 Jul 2020 17:03:35 +0200 Subject: [PATCH 12/37] QmlDesigner: Annotations for States - Added Annotations support for States Task: QDS-2312 Change-Id: I204ec958f85bd0f05eae0abbb3848d6d59e7e397 Reviewed-by: Vikas Pachdha --- .../statesEditorQmlSources/StatesDelegate.qml | 26 +++++ .../annotationeditor/annotationeditor.cpp | 9 +- .../stateseditor/stateseditormodel.cpp | 15 +++ .../stateseditor/stateseditormodel.h | 3 + .../stateseditor/stateseditorview.cpp | 94 ++++++++++++++++--- .../stateseditor/stateseditorview.h | 5 + .../designercore/include/qmlstate.h | 8 ++ .../designercore/model/qmlstate.cpp | 39 ++++++++ 8 files changed, 184 insertions(+), 15 deletions(-) diff --git a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml index ef624574ac8..6b01f322f85 100644 --- a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml +++ b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml @@ -41,6 +41,8 @@ Rectangle { property int delegateStateImageSize property bool delegateHasWhenCondition property string delegateWhenConditionString + property bool hasAnnotation: checkAnnotation() + readonly property bool isDefaultState: isDefault signal delegateInteraction @@ -53,6 +55,10 @@ Rectangle { return stringList } + function checkAnnotation() { + return statesEditorModel.hasAnnotation(internalNodeId) + } + MouseArea { id: mouseArea anchors.fill: parent @@ -120,11 +126,31 @@ Rectangle { } } + StudioControls.MenuItem { + enabled: !isBaseState + text: (hasAnnotation ? qsTr("Edit Annotation") + : qsTr("Add Annotation")) + onTriggered: { + statesEditorModel.setAnnotation(internalNodeId) + hasAnnotation = checkAnnotation() + } + } + + StudioControls.MenuItem { + enabled: !isBaseState && hasAnnotation + text: qsTr("Remove Annotation") + onTriggered: { + statesEditorModel.removeAnnotation(internalNodeId) + hasAnnotation = checkAnnotation() + } + } + onClosed: { stateNameField.actionIndicator.forceVisible = false } onOpened: { + hasAnnotation = checkAnnotation() myRoot.delegateInteraction() } } diff --git a/src/plugins/qmldesigner/components/annotationeditor/annotationeditor.cpp b/src/plugins/qmldesigner/components/annotationeditor/annotationeditor.cpp index c119dfdca1e..21add0a7526 100644 --- a/src/plugins/qmldesigner/components/annotationeditor/annotationeditor.cpp +++ b/src/plugins/qmldesigner/components/annotationeditor/annotationeditor.cpp @@ -38,7 +38,8 @@ namespace QmlDesigner { -AnnotationEditor::AnnotationEditor(QObject *) +AnnotationEditor::AnnotationEditor(QObject *parent) + : QObject(parent) { } @@ -55,9 +56,9 @@ void AnnotationEditor::registerDeclarativeType() void AnnotationEditor::showWidget() { m_dialog = new AnnotationEditorDialog(Core::ICore::dialogParent(), - modelNode().validId(), - modelNode().customId(), - modelNode().annotation()); + m_modelNode.id(), + m_modelNode.customId(), + m_modelNode.annotation()); QObject::connect(m_dialog, &AnnotationEditorDialog::accepted, this, &AnnotationEditor::acceptedClicked); diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp index f2a83d05182..1828317a9e8 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp @@ -249,4 +249,19 @@ bool StatesEditorModel::hasDefaultState() const return m_statesEditorView->hasDefaultState(); } +void StatesEditorModel::setAnnotation(int internalNodeId) +{ + m_statesEditorView->setAnnotation(internalNodeId); +} + +void StatesEditorModel::removeAnnotation(int internalNodeId) +{ + m_statesEditorView->removeAnnotation(internalNodeId); +} + +bool StatesEditorModel::hasAnnotation(int internalNodeId) const +{ + return m_statesEditorView->hasAnnotation(internalNodeId); +} + } // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.h b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.h index 97c4c6a9ec5..65c1385e897 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.h +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.h @@ -67,6 +67,9 @@ public: Q_INVOKABLE void setStateAsDefault(int internalNodeId); Q_INVOKABLE void resetDefaultState(); Q_INVOKABLE bool hasDefaultState() const; + Q_INVOKABLE void setAnnotation(int internalNodeId); + Q_INVOKABLE void removeAnnotation(int internalNodeId); + Q_INVOKABLE bool hasAnnotation(int internalNodeId) const; void reset(); diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp index 8a2ca50c154..78ac9da2303 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp @@ -30,6 +30,7 @@ #include #include +#include #include #include @@ -40,6 +41,7 @@ #include #include +#include namespace QmlDesigner { @@ -51,7 +53,8 @@ namespace QmlDesigner { StatesEditorView::StatesEditorView(QObject *parent) : AbstractView(parent), m_statesEditorModel(new StatesEditorModel(this)), - m_lastIndex(-1) + m_lastIndex(-1), + m_editor(nullptr) { Q_ASSERT(m_statesEditorModel); // base state @@ -59,6 +62,8 @@ StatesEditorView::StatesEditorView(QObject *parent) : StatesEditorView::~StatesEditorView() { + if (m_editor) + delete m_editor; delete m_statesEditorWidget.data(); } @@ -274,6 +279,8 @@ void StatesEditorView::setWhenCondition(int internalNodeId, const QString &condi return; m_block = true; + auto guard = [this]() { m_block = false; }; + QScopeGuard lock(guard); if (hasModelNodeForInternalId(internalNodeId)) { QmlModelState state(modelNodeForInternalId(internalNodeId)); @@ -285,8 +292,6 @@ void StatesEditorView::setWhenCondition(int internalNodeId, const QString &condi e.showException(); } } - - m_block = false; } void StatesEditorView::resetWhenCondition(int internalNodeId) @@ -295,6 +300,8 @@ void StatesEditorView::resetWhenCondition(int internalNodeId) return; m_block = true; + auto guard = [this]() { m_block = false; }; + QScopeGuard lock(guard); if (hasModelNodeForInternalId(internalNodeId)) { QmlModelState state(modelNodeForInternalId(internalNodeId)); @@ -306,8 +313,6 @@ void StatesEditorView::resetWhenCondition(int internalNodeId) e.showException(); } } - - m_block = false; } void StatesEditorView::setStateAsDefault(int internalNodeId) @@ -316,6 +321,8 @@ void StatesEditorView::setStateAsDefault(int internalNodeId) return; m_block = true; + auto guard = [this]() { m_block = false; }; + QScopeGuard lock(guard); if (hasModelNodeForInternalId(internalNodeId)) { QmlModelState state(modelNodeForInternalId(internalNodeId)); @@ -327,8 +334,6 @@ void StatesEditorView::setStateAsDefault(int internalNodeId) e.showException(); } } - - m_block = false; } void StatesEditorView::resetDefaultState() @@ -337,6 +342,8 @@ void StatesEditorView::resetDefaultState() return; m_block = true; + auto guard = [this]() { m_block = false; }; + QScopeGuard lock(guard); try { if (rootModelNode().hasProperty("state")) @@ -345,8 +352,6 @@ void StatesEditorView::resetDefaultState() } catch (const RewritingException &e) { e.showException(); } - - m_block = false; } bool StatesEditorView::hasDefaultState() const @@ -354,6 +359,70 @@ bool StatesEditorView::hasDefaultState() const return rootModelNode().hasProperty("state"); } +void StatesEditorView::setAnnotation(int internalNodeId) +{ + if (m_block) + return; + + m_block = true; + auto guard = [this]() { m_block = false; }; + QScopeGuard lock(guard); + + if (hasModelNodeForInternalId(internalNodeId)) { + QmlModelState state(modelNodeForInternalId(internalNodeId)); + try { + if (state.isValid()) { + ModelNode modelNode = state.modelNode(); + + if (modelNode.isValid()) { + if (!m_editor) + m_editor = new AnnotationEditor(this); + + m_editor->setModelNode(modelNode); + m_editor->showWidget(); + } + } + + } catch (const RewritingException &e) { + e.showException(); + } + } +} + +void StatesEditorView::removeAnnotation(int internalNodeId) +{ + if (m_block) + return; + + m_block = true; + auto guard = [this]() { m_block = false; }; + QScopeGuard lock(guard); + + if (hasModelNodeForInternalId(internalNodeId)) { + QmlModelState state(modelNodeForInternalId(internalNodeId)); + try { + if (state.isValid()) { + state.removeAnnotation(); + } + + } catch (const RewritingException &e) { + e.showException(); + } + } +} + +bool StatesEditorView::hasAnnotation(int internalNodeId) const +{ + if (hasModelNodeForInternalId(internalNodeId)) { + QmlModelState state(modelNodeForInternalId(internalNodeId)); + if (state.isValid()) { + return state.hasAnnotation(); + } + } + + return false; +} + void StatesEditorView::modelAttached(Model *model) { if (model == AbstractView::model()) @@ -444,7 +513,12 @@ void StatesEditorView::bindingPropertiesChanged(const QList &pr void StatesEditorView::variantPropertiesChanged(const QList &propertyList, AbstractView::PropertyChangeFlags /*propertyChange*/) { + if (m_block) + return; + m_block = true; + auto guard = [this]() { m_block = false; }; + QScopeGuard lock(guard); for (const VariantProperty &property : propertyList) { if (property.name() == "name" && QmlModelState::isValidQmlModelState(property.parentModelNode())) @@ -452,8 +526,6 @@ void StatesEditorView::variantPropertiesChanged(const QList &pr else if (property.name() == "state" && property.parentModelNode().isRootNode()) resetModel(); } - - m_block = false; } void StatesEditorView::currentStateChanged(const ModelNode &node) diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h index 66ab998e041..44b4a3a380d 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h @@ -33,6 +33,7 @@ namespace QmlDesigner { class StatesEditorModel; class StatesEditorWidget; +class AnnotationEditor; class StatesEditorView : public AbstractView { Q_OBJECT @@ -47,6 +48,9 @@ public: void setStateAsDefault(int internalNodeId); void resetDefaultState(); bool hasDefaultState() const; + void setAnnotation(int internalNodeId); + void removeAnnotation(int internalNodeId); + bool hasAnnotation(int internalNodeId) const; bool validStateName(const QString &name) const; QString currentStateName() const; void setCurrentState(const QmlModelState &state); @@ -102,6 +106,7 @@ private: QPointer m_statesEditorWidget; int m_lastIndex; bool m_block = false; + QPointer m_editor; }; } // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/designercore/include/qmlstate.h b/src/plugins/qmldesigner/designercore/include/qmlstate.h index 156e441615f..7c43ac87761 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlstate.h +++ b/src/plugins/qmldesigner/designercore/include/qmlstate.h @@ -34,6 +34,8 @@ namespace QmlDesigner { class AbstractViewAbstractVieweGroup; class QmlObjectNode; class QmlModelStateGroup; +class Annotation; +class AnnotationEditor; class QMLDESIGNERCORE_EXPORT QmlModelState : public QmlModelNodeFacade { @@ -72,6 +74,12 @@ public: void setAsDefault(); bool isDefault() const; + void setAnnotation(const Annotation &annotation, const QString &id); + Annotation annotation() const; + QString annotationName() const; + bool hasAnnotation() const; + void removeAnnotation(); + protected: void addChangeSetIfNotExists(const ModelNode &node); static QmlModelState createBaseState(const AbstractView *view); diff --git a/src/plugins/qmldesigner/designercore/model/qmlstate.cpp b/src/plugins/qmldesigner/designercore/model/qmlstate.cpp index 89bbec351eb..4a38985ad1b 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlstate.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlstate.cpp @@ -32,6 +32,8 @@ #include "bindingproperty.h" #include "qmlchangeset.h" #include "qmlitemnode.h" +#include "annotation.h" +#include "annotationeditor/annotationeditor.h" #include @@ -304,6 +306,43 @@ bool QmlModelState::isDefault() const return false; } +void QmlModelState::setAnnotation(const Annotation &annotation, const QString &id) +{ + if (modelNode().isValid()) { + modelNode().setCustomId(id); + modelNode().setAnnotation(annotation); + } +} + +Annotation QmlModelState::annotation() const +{ + if (modelNode().isValid()) + return modelNode().annotation(); + return {}; +} + +QString QmlModelState::annotationName() const +{ + if (modelNode().isValid()) + return modelNode().customId(); + return {}; +} + +bool QmlModelState::hasAnnotation() const +{ + if (modelNode().isValid()) + return modelNode().hasAnnotation() || modelNode().hasCustomId(); + return false; +} + +void QmlModelState::removeAnnotation() +{ + if (modelNode().isValid()) { + modelNode().removeCustomId(); + modelNode().removeAnnotation(); + } +} + QmlModelState QmlModelState::createBaseState(const AbstractView *view) { QmlModelState qmlModelState(view->rootModelNode()); From 5a8d4c6fc10c96cfeae42c088aef930dfe494166 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Fri, 21 Aug 2020 10:12:58 +0200 Subject: [PATCH 13/37] QmlDesigner: Update icon font * Update icon font * Use newly added icons in EditableListView Change-Id: Ia21c2120c54c41cd00dca07622ced98a0bf7f7f0 Reviewed-by: Miikka Heikkinen Reviewed-by: Thomas Hartmann --- .../HelperWidgets/EditableListView.qml | 6 +- .../imports/StudioTheme/InternalConstants.qml | 58 ++++++++++-------- .../imports/StudioTheme/icons.ttf | Bin 13620 -> 14124 bytes .../components/componentcore/theme.h | 4 ++ src/plugins/qmldesigner/designmodewidget.cpp | 2 +- 5 files changed, 38 insertions(+), 32 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml index 7fc3c9f3f2f..a2a73d4edf7 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml @@ -188,8 +188,7 @@ Rectangle { onClicked: extFuncLogic.show() } StudioControls.AbstractButton { - buttonIcon: "+" - iconFont: StudioTheme.Constants.font + buttonIcon: StudioTheme.Constants.plus enabled: !myRepeater.dirty && !(editableListView.backendValue.isInModel && !editableListView.backendValue.isIdList) onClicked: { var idx = myRepeater.localModel.push("") - 1 @@ -200,8 +199,7 @@ Rectangle { } } StudioControls.AbstractButton { - buttonIcon: "-" - iconFont: StudioTheme.Constants.font + buttonIcon: StudioTheme.Constants.minus enabled: myRepeater.model.length && !(editableListView.backendValue.isInModel && !editableListView.backendValue.isIdList) onClicked: { var lastItem = myColumn.currentIndex === myRepeater.localModel.length - 1 diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml index 3d17883c544..808da702d51 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml @@ -94,33 +94,37 @@ QtObject { readonly property string fontStyleItalic: "\u0057" readonly property string fontStyleStrikethrough: "\u0058" readonly property string fontStyleUnderline: "\u0059" - readonly property string idAliasOff: "\u005A" - readonly property string idAliasOn: "\u005B" - readonly property string mergeCells: "\u005C" - readonly property string redo: "\u005D" - readonly property string splitColumns: "\u005E" - readonly property string splitRows: "\u005F" - readonly property string startNode: "\u0060" - readonly property string testIcon: "\u0061" - readonly property string textAlignBottom: "\u0062" - readonly property string textAlignCenter: "\u0063" - readonly property string textAlignLeft: "\u0064" - readonly property string textAlignMiddle: "\u0065" - readonly property string textAlignRight: "\u0066" - readonly property string textAlignTop: "\u0067" - readonly property string textBulletList: "\u0068" - readonly property string textFullJustification: "\u0069" - readonly property string textNumberedList: "\u006A" - readonly property string tickIcon: "\u006B" - readonly property string triState: "\u006C" - readonly property string undo: "\u006D" - readonly property string upDownIcon: "\u006E" - readonly property string upDownSquare2: "\u006F" - readonly property string wildcard: "\u0070" - readonly property string zoomAll: "\u0071" - readonly property string zoomIn: "\u0072" - readonly property string zoomOut: "\u0073" - readonly property string zoomSelection: "\u0074" + readonly property string gridView: "\u005A" + readonly property string idAliasOff: "\u005B" + readonly property string idAliasOn: "\u005C" + readonly property string listView: "\u005D" + readonly property string mergeCells: "\u005E" + readonly property string minus: "\u005F" + readonly property string plus: "\u0060" + readonly property string redo: "\u0061" + readonly property string splitColumns: "\u0062" + readonly property string splitRows: "\u0063" + readonly property string startNode: "\u0064" + readonly property string testIcon: "\u0065" + readonly property string textAlignBottom: "\u0066" + readonly property string textAlignCenter: "\u0067" + readonly property string textAlignLeft: "\u0068" + readonly property string textAlignMiddle: "\u0069" + readonly property string textAlignRight: "\u006A" + readonly property string textAlignTop: "\u006B" + readonly property string textBulletList: "\u006C" + readonly property string textFullJustification: "\u006D" + readonly property string textNumberedList: "\u006E" + readonly property string tickIcon: "\u006F" + readonly property string triState: "\u0070" + readonly property string undo: "\u0071" + readonly property string upDownIcon: "\u0072" + readonly property string upDownSquare2: "\u0073" + readonly property string wildcard: "\u0074" + readonly property string zoomAll: "\u0075" + readonly property string zoomIn: "\u0076" + readonly property string zoomOut: "\u0077" + readonly property string zoomSelection: "\u0078" readonly property font iconFont: Qt.font({ "family": controlIcons.name, diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf index 46a677784ac73630e3e5156da147872031d01bda..e5483927478ad75e6fc62a213f1d8f42b210acf9 100644 GIT binary patch delta 1419 zcmdmzwI;8gfsuiMftR6yftew|%`L=t!ru9s3=HN13=9l1{=xc2k*z6f85kHN7#J85 zl5-Oae#mMtGB7YzFfcGWC6|>bFeoxrGB7ajVPIfjNlz>;`2U}QnSsHagMop8BR!`w zZJmhjX$A(C3I+y^8yTsIDYD5=Vi*`0?l3Sgm}O+7)+ciP`ag+*fl-8kfk7oBx1>T) zoWq-efpG@|1H- z3=Fyf3=B+{3-XIgHvddq$G~8q!oa}x5bQZd28P+PZ6D(KZN4&aGrwS9U|_hN8qf!! znF9JIG1{_5GZZp#Omcg0}FkN7J!JNk2!n}m} z81oYrHWn|I43;XEeXJ&|6|8&M7}zA(9N040F0m`H7qBm5|G`niv5DgaryQpb=PJ%~ zoS(SFxU9JHxOQ;e;O65t;tt|2;-1ERfro)dj3 zJ>mPrFTkJ1zeRvaK_Eh4nZO^x2*D*n4niqHHA35jE(yI8b`YK=d{0D5BxiF5iz!Pz zBSY)|oy@*W4GeM&42)tT?3^HiO-Y@TkxfZm&BUCOQO(56NSu?=%!t{YjqTqFMtyd6 zc2V|!7ylh*6Juj%XLR^?oSjdYozarff?b%Yl3j%D--&{sHmi7VrHypBql1x#*C9=roTjE6qpGGgrzWEsNb=vU&ClhI zaqF`&@cnmWzRt|Uz{_7GR!yQA<{U z>9$|bQM;ZVyQ4jR%^4fgC%@H{)KjqQ^|!P0?~Uv6v$ON-v11fU-*90=di1{=I*jT$ zy?(vvwtpQ%r>vVC7B+d^l*v=Hjnz#V6(AXtfrUYmu?xy(We{LI24%A`NHTFxey6Rg zp2e_*fti7kg_D7W!H6*o%4TIyU|a%avoRPkUf=Ab!^_BS#9+vv%V04%MAw4F$WYf} za=-4i$tik@jM0Z8`bLi4&4%J!4>C2JtuKCRP+MEM-{4z`$t1z`&r8mzbN{X>PxrfkAr; z0|V2Ag8bqV)t#I97#Q?Y7#P^rfIY{^z>u@PT_v91<|_j?^9u$B28P>O<~b0W$vkHg zqb+MVLm>mtWGBW*(Gq5b{}v2U%qk2g85qF&8JMLfZ(vks%$0ft^8bvKvz@ zW69(tOx=?mnQJBoFbhrI%PdoG#WaIy3)2~9FXjy94(3(NCzxNc=&|^)#IY=5m0*ow zUBLQ;^$(j0n-AMIb{6&!_Ad5290?rLIL>e~aT;*;ac<(g#`%j&jw^_34%Z&8PuybM zX53-iRoq*+pK$-;ap5W9*~asO*MYZ+cMI;QJ;~K)tr%^ zk+EKY>8_x_UuCAZf`63-1exvz2r%6h5d5nwCB z*_9Dk)L7lrSkzS6)L2wm5h^aO4C1q!8jDVL(3Vr!r^hc};N;Zm=-8?!&#xyhugA|Q z3FdzVb0_oY$Vo*h@aromC@ARj`#U+c=*i22l*w;$a$=Yqplhsd!YBucMFtiINyc_4 zo0UO;@i3Il#vsYWF?p4)u6hQ;76xVpMix#676v26U?`iFL4k20l+DIq#CT=%KV4o% zR&xej2J^{6`WDRQy5^Jp^sh};HBev-pX_F^Zu1`lW0uJ_rm|doxv53zsm`f6Ih&hJ bTNxD@|Nm!Tf~BjQpZ@VcQXwogn&$ujg|pbX diff --git a/src/plugins/qmldesigner/components/componentcore/theme.h b/src/plugins/qmldesigner/components/componentcore/theme.h index 880a1d05caa..f6a1df97cc1 100644 --- a/src/plugins/qmldesigner/components/componentcore/theme.h +++ b/src/plugins/qmldesigner/components/componentcore/theme.h @@ -103,9 +103,13 @@ public: fontStyleItalic, fontStyleStrikethrough, fontStyleUnderline, + gridView, idAliasOff, idAliasOn, + listView, mergeCells, + minus, + plus, redo, splitColumns, splitRows, diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index d17bf5a10c8..bd7d09af316 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -246,9 +246,9 @@ void DesignModeWidget::setup() const QString undockUnicode = Theme::getIconUnicode(Theme::Icon::adsDetach); const QString fontName = "qtds_propertyIconFont.ttf"; + const QIcon closeIcon = Utils::StyleHelper::getIconFromIconFont(fontName, closeUnicode, 28, 28, buttonColor); const QIcon menuIcon = Utils::StyleHelper::getIconFromIconFont(fontName, menuUnicode, 28, 28, buttonColor); const QIcon undockIcon = Utils::StyleHelper::getIconFromIconFont(fontName, undockUnicode, 28, 28, buttonColor); - const QIcon closeIcon = Utils::StyleHelper::getIconFromIconFont(fontName, closeUnicode, 28, 28, buttonColor); auto closeIconNormal = Utils::StyleHelper::IconFontHelper(closeUnicode, tabColor, From 8702f58a0346cba34b5db6d20e0a047633cfab06 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 25 Aug 2020 17:10:49 +0200 Subject: [PATCH 14/37] Doc: Update info about binding and connection editor Change-Id: I95a77b700db341bb5e63a2052396904598b16dea Reviewed-by: Thomas Hartmann --- .../images/qmldesigner-connections.png | Bin 3299 -> 5705 bytes .../qtquick-connection-editor-action.png | Bin 0 -> 4418 bytes .../qtquick-connection-editor-assignment.png | Bin 0 -> 4988 bytes .../src/qtquick/qtquick-components.qdoc | 26 +++++++--- .../qtquick-connection-editor-bindings.qdoc | 6 +++ .../qtquick-connection-editor-properties.qdoc | 7 +++ .../qtquick-connection-editor-signals.qdoc | 46 ++++++++++++++++++ 7 files changed, 78 insertions(+), 7 deletions(-) create mode 100644 doc/qtcreator/images/qtquick-connection-editor-action.png create mode 100644 doc/qtcreator/images/qtquick-connection-editor-assignment.png diff --git a/doc/qtcreator/images/qmldesigner-connections.png b/doc/qtcreator/images/qmldesigner-connections.png index 165385d9b2834a5541abc62820edb344cbd5a866..ae0f3146a80f83deb32b94f630da738ac5f0b15b 100644 GIT binary patch literal 5705 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

uiaT_zo|QPf8DvqXUeixEi60R zdaXV1Y@wayZ?h{Q#YLsF|AmMAv#1NS*^_@$zkFA`(`dps=RI8^|+?)73=%_pM}5g{(O5={_>X>yT2?~`@UJ&v?lKNl<)Vqn5Rtg z68d}Ce&50GTUGW>vbT$}6)^5j51Utf)9d?pg31G(rU zX#A*RgTe~DWM4f3+Al# literal 3299 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 diff --git a/doc/qtcreator/images/qtquick-connection-editor-action.png b/doc/qtcreator/images/qtquick-connection-editor-action.png new file mode 100644 index 0000000000000000000000000000000000000000..7fca44baacf7aa00612bb6c910af2af3f6503ea1 GIT binary patch literal 4418 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 literal 0 HcmV?d00001 diff --git a/doc/qtcreator/src/qtquick/qtquick-components.qdoc b/doc/qtcreator/src/qtquick/qtquick-components.qdoc index 24b81e80dd7..8ea2cbda706 100644 --- a/doc/qtcreator/src/qtquick/qtquick-components.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-components.qdoc @@ -76,16 +76,28 @@ \list 1 \li Drag and drop components from \uicontrol Library (1) to \uicontrol Navigator (2) or \uicontrol {Form Editor} (3). - \li Select components in \uicontrol Navigator to edit their - properties in \uicontrol Properties. + \li Select components in \uicontrol Navigator to edit the + values of their properties in \uicontrol Properties. \image qmldesigner-properties-view.png "Properties view" For more information, see \l {Specifying Item Properties}. - \li Connect components to signals or create bindings between components - in the \uicontrol Connections view. + \li To change the appearance and behavior of your components in ways + that are not supported out of the box, you can define custom + properties for your components in the \uicontrol Connections view, + \uicontrol Properties tab. + \image qmldesigner-dynamicprops.png "Connections view Properties tab" + For more information, see \l{Specifying Dynamic Properties}. + \li To enable users to interact with components, connect the components + to signals in the \uicontrol Connections view. For example, you can + specify what happens when a component is clicked. + For more information, see \l{Connecting Objects to Signals}. + \image qmldesigner-connections.png "Connections view Connections tab" + \li To dynamically change the behavior of an object when another object + changes, create bindings between components in the + \uicontrol Connections view, \uicontrol Bindings tab. + For more information, see \l{Adding Bindings Between Properties}. \image qmldesigner-bindings.png "Connections view Bindings tab" - For more information, see \l{Adding Connections}. - \li Add states to apply sets of changes to the properties of one or - several components in the \uicontrol States view. + \li Add states to apply sets of changes to the property values of one + or several components in the \uicontrol States view. For more information, see \l{Adding States}. \li Animate component properties in the \uicontrol Timeline view. For more information, see \l{Creating Animations}. diff --git a/doc/qtcreator/src/qtquick/qtquick-connection-editor-bindings.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor-bindings.qdoc index b8ecfaab9dc..d3139ce23b9 100644 --- a/doc/qtcreator/src/qtquick/qtquick-connection-editor-bindings.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-connection-editor-bindings.qdoc @@ -65,4 +65,10 @@ \li Double-click the value in the \uicontrol {Source Property} column to select the property to bind the target property to. \endlist + + Right-click a binding and select \uicontrol {Open Binding Editor} in + the context menu to specify the binding as a JavaScript expression in + \uicontrol {Binding Editor}. For more information, see \l{Setting Bindings}. + + \image qmldesigner-binding-editor.png "Binding Editor" */ diff --git a/doc/qtcreator/src/qtquick/qtquick-connection-editor-properties.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor-properties.qdoc index 176a9070a38..870091441b7 100644 --- a/doc/qtcreator/src/qtquick/qtquick-connection-editor-properties.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-connection-editor-properties.qdoc @@ -67,6 +67,13 @@ to specify the value of the property. \endlist + Right-click a property and select \uicontrol {Open Binding Editor} in + the context menu to bind the value of the property to that of another one + or to data accessible in the application in \uicontrol {Binding Editor}. + For more information, see \l{Setting Bindings}. + + \image qmldesigner-binding-editor.png "Binding Editor" + The properties you add for a QML type are displayed in the \uicontrol Properties view when you select a component of that type in \uicontrol Navigator or \uicontrol {Form Editor}. diff --git a/doc/qtcreator/src/qtquick/qtquick-connection-editor-signals.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor-signals.qdoc index 2a641741857..876f32f514d 100644 --- a/doc/qtcreator/src/qtquick/qtquick-connection-editor-signals.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-connection-editor-signals.qdoc @@ -42,6 +42,16 @@ clicked within the area. Since the signal name is \c clicked, the signal handler for receiving this signal is named \c onClicked. + A signal is automatically emitted when the value of a QML property changes. + This type of signal is a \e{property change signal} and signal handlers + for these signals are written in the form \c onChanged, where + \e is the name of the property, with the first letter + capitalized. + + For example, the MouseArea type has a \c pressed property. To receive a + notification whenever this property changes, you would use a signal handler + called \c onPressedChanged. + For more information about signals and signal handlers, see \l{Signal and Handler Event System}. @@ -70,7 +80,43 @@ to specify the actions. \endlist + Right-click a connection and select \uicontrol {Open Connection Editor} + in the context menu to specify the connection in + \uicontrol {Connection Editor}. + \if defined(qtdesignstudio) + \section1 Adding Actions and Assignments + + You use the \uicontrol {Connection Editor} to create the JavaScript + expressions for \e actions and \e assignments. An \e action connects + an object to a signal, whereas an \e assignment fetches property values + from another object. + + For more information about the logical operators that you can use to + construct conditional expressions, see \l {Summary of Logical Operators}. + + To create JavaScript expressions for actions: + + \image qtquick-connection-editor-action.png + + \list 1 + \li Select \uicontrol Action as the type of the connections object. + \li Select the object to connect to a signal. + \li Select the action to perform when the signal is emitted. + \endlist + + To create JavaScript expressions for assignments: + + \image qtquick-connection-editor-assignment.png + + \list 1 + \li Select \uicontrol Assignment as the type of the connections object. + \li Select the target object for the property assignment. + \li Select the property of the target object to assign a value to. + \li Select the source object for the property assignment. + \li Select the property of the source object to fetch the value from. + \endlist + For an example of connecting the \c clicked signal of a button to a \l{Adding States}{state}, see \l {Log In UI - Part 3}. \endif From 3fd911023370879a89f6ca9e493cce5e0db294ac Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 25 Aug 2020 12:34:00 +0300 Subject: [PATCH 15/37] QmlDesigner: Allow image drag to create Texture on all materials Dragging image asset to any 3D material type now creates a Texture out of the image. Default materials assign the created Texture to a diffuse map and principled materials assign it to base color map. Custom material just creates the Texture without any assignments. Task-number: QDS-2657 Change-Id: I065f98cbc4d8c3293fbacea9ef8649d0a2edfb0a Reviewed-by: Mahmoud Badri Reviewed-by: Thomas Hartmann --- .../components/navigator/navigatortreemodel.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index cf51c1a0220..e543537211f 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -606,7 +606,7 @@ void NavigatorTreeModel::handleItemLibraryImageDrop(const QMimeData *mimeData, i ModelNode newModelNode; - if (targetNode.isSubclassOf("QtQuick3D.DefaultMaterial")) { + if (targetNode.isSubclassOf("QtQuick3D.Material")) { // if dropping an image on a default material, create a texture instead of image m_view->executeInTransaction("QmlItemNode::createQmlItemNode", [&] { // create a texture item lib @@ -623,9 +623,12 @@ void NavigatorTreeModel::handleItemLibraryImageDrop(const QMimeData *mimeData, i // create a texture newModelNode = QmlItemNode::createQmlObjectNode(m_view, itemLibraryEntry, {}, targetProperty, false); - // set the texture to parent material's diffuseMap property - // TODO: allow the user to choose which map property to set the texture for - targetNode.bindingProperty("diffuseMap").setExpression(newModelNode.validId()); + // Automatically set the texture to default property + // TODO: allow the user to choose which map property to set the texture for (QDS-2326) + if (targetNode.isSubclassOf("QtQuick3D.DefaultMaterial")) + targetNode.bindingProperty("diffuseMap").setExpression(newModelNode.validId()); + else if (targetNode.isSubclassOf("QtQuick3D.PrincipledMaterial")) + targetNode.bindingProperty("baseColorMap").setExpression(newModelNode.validId()); }); } else if (targetNode.isSubclassOf("QtQuick3D.Texture")) { // if dropping an image on a texture, set the texture source From 61b21b0a2fa91d8146c1b68a267608159727e2b6 Mon Sep 17 00:00:00 2001 From: Aleksei German Date: Thu, 27 Aug 2020 16:42:22 +0200 Subject: [PATCH 16/37] QmlDesigner: Fix for RichTextEditor Qt Version Original task: QDS-2634 Change-Id: I7edc580aec36090e037c4520ad364a62427df9f0 Reviewed-by: Christian Stenger --- .../qmldesigner/components/richtexteditor/richtexteditor.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp b/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp index f0cafc892d3..eda25ec9b8a 100644 --- a/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp +++ b/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp @@ -530,11 +530,14 @@ void RichTextEditor::setupTableActions() cursorEditBlock(cursor, [&] () { //format table cells to look a bit better: QTextTableFormat tableFormat; - tableFormat.setBorderCollapse(true); tableFormat.setCellSpacing(2.0); tableFormat.setCellPadding(2.0); tableFormat.setBorder(1.0); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) + tableFormat.setBorderCollapse(true); +#endif + cursor.insertTable(1, 1, tableFormat); //move cursor into the first cell of the table: From ae0b98a32a37a2ab0213e42e2de0652d77900310 Mon Sep 17 00:00:00 2001 From: Aleksei German Date: Thu, 27 Aug 2020 18:50:36 +0200 Subject: [PATCH 17/37] QmlDesigner: Fix for States compilation break Fixing compilation break in StatesEditorView: QtCreator is build with 5.12 QScopeGuard is from 5.14+ Replaced scope guard with unique_ptr original task: QDS-2312 Change-Id: Id6a4bf513f37675044b073be2dfe52e3fa9dc3bc Reviewed-by: Christian Stenger --- .../stateseditor/stateseditorview.cpp | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp index 78ac9da2303..a74b86b828b 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp @@ -30,8 +30,8 @@ #include #include -#include #include +#include #include @@ -279,8 +279,8 @@ void StatesEditorView::setWhenCondition(int internalNodeId, const QString &condi return; m_block = true; - auto guard = [this]() { m_block = false; }; - QScopeGuard lock(guard); + auto guard = [this](int* p) { m_block = false; delete p; }; + std::unique_ptr scopeGuard(new int, guard); if (hasModelNodeForInternalId(internalNodeId)) { QmlModelState state(modelNodeForInternalId(internalNodeId)); @@ -300,8 +300,8 @@ void StatesEditorView::resetWhenCondition(int internalNodeId) return; m_block = true; - auto guard = [this]() { m_block = false; }; - QScopeGuard lock(guard); + auto guard = [this](int* p) { m_block = false; delete p; }; + std::unique_ptr scopeGuard(new int, guard); if (hasModelNodeForInternalId(internalNodeId)) { QmlModelState state(modelNodeForInternalId(internalNodeId)); @@ -321,8 +321,8 @@ void StatesEditorView::setStateAsDefault(int internalNodeId) return; m_block = true; - auto guard = [this]() { m_block = false; }; - QScopeGuard lock(guard); + auto guard = [this](int* p) { m_block = false; delete p; }; + std::unique_ptr scopeGuard(new int, guard); if (hasModelNodeForInternalId(internalNodeId)) { QmlModelState state(modelNodeForInternalId(internalNodeId)); @@ -342,8 +342,8 @@ void StatesEditorView::resetDefaultState() return; m_block = true; - auto guard = [this]() { m_block = false; }; - QScopeGuard lock(guard); + auto guard = [this](int* p) { m_block = false; delete p; }; + std::unique_ptr scopeGuard(new int, guard); try { if (rootModelNode().hasProperty("state")) @@ -365,8 +365,8 @@ void StatesEditorView::setAnnotation(int internalNodeId) return; m_block = true; - auto guard = [this]() { m_block = false; }; - QScopeGuard lock(guard); + auto guard = [this](int* p) { m_block = false; delete p; }; + std::unique_ptr scopeGuard(new int, guard); if (hasModelNodeForInternalId(internalNodeId)) { QmlModelState state(modelNodeForInternalId(internalNodeId)); @@ -395,8 +395,8 @@ void StatesEditorView::removeAnnotation(int internalNodeId) return; m_block = true; - auto guard = [this]() { m_block = false; }; - QScopeGuard lock(guard); + auto guard = [this](int* p) { m_block = false; delete p; }; + std::unique_ptr scopeGuard(new int, guard); if (hasModelNodeForInternalId(internalNodeId)) { QmlModelState state(modelNodeForInternalId(internalNodeId)); @@ -517,8 +517,8 @@ void StatesEditorView::variantPropertiesChanged(const QList &pr return; m_block = true; - auto guard = [this]() { m_block = false; }; - QScopeGuard lock(guard); + auto guard = [this](int* p) { m_block = false; delete p; }; + std::unique_ptr scopeGuard(new int, guard); for (const VariantProperty &property : propertyList) { if (property.name() == "name" && QmlModelState::isValidQmlModelState(property.parentModelNode())) From f69ce702afaf62d48b365c06f47f1afca374f3ac Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 27 Aug 2020 12:55:39 +0300 Subject: [PATCH 18/37] QmlDesigner: Handle shaders and commands dragged to passes Quick3D shaders and commands dragged to passes from item library will be automatically added to corresponding property, too. The shader or command is also moved to the same level as the pass as passes can't have child nodes. Task-number: QDS-2657 Change-Id: Id7efc302b06703ddd669b679b65d3adc9ecb48de Reviewed-by: Mahmoud Badri Reviewed-by: Thomas Hartmann --- .../navigator/navigatortreemodel.cpp | 52 ++++++++++++++++--- .../components/navigator/navigatortreemodel.h | 3 +- 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index e543537211f..4671f94bf68 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -526,6 +526,7 @@ void NavigatorTreeModel::handleItemLibraryItemDrop(const QMimeData *mimeData, in const QString targetPropertyName = hints.forceNonDefaultProperty(); bool foundTarget = findTargetProperty(rowModelIndex, this, &targetProperty, &targetRowNumber, targetPropertyName.toUtf8()); + bool moveNodesAfter = true; if (foundTarget) { if (!NodeHints::fromItemLibraryEntry(itemLibraryEntry).canBeDroppedInNavigator()) @@ -569,16 +570,43 @@ void NavigatorTreeModel::handleItemLibraryItemDrop(const QMimeData *mimeData, in } insertIntoList("effects", targetEnv); } else if (newModelNode.isSubclassOf("QtQuick3D.Material")) { - // Insert material dropped to a model node into the materials list of the model - ModelNode targetModel; - if (targetProperty.parentModelNode().isSubclassOf("QtQuick3D.Model")) + if (targetProperty.parentModelNode().isSubclassOf("QtQuick3D.Model")) { + // Insert material dropped to a model node into the materials list of the model + ModelNode targetModel; targetModel = targetProperty.parentModelNode(); - insertIntoList("materials", targetModel); + insertIntoList("materials", targetModel); + } + } else { + const bool isShader = newModelNode.isSubclassOf("QtQuick3D.Shader"); + if (isShader || newModelNode.isSubclassOf("QtQuick3D.Command")) { + if (targetProperty.parentModelNode().isSubclassOf("QtQuick3D.Pass")) { + // Shaders and commands inserted into a Pass will be added to proper list. + // They are also moved to the same level as the pass, as passes don't + // allow child nodes (QTBUG-86219). + ModelNode targetModel; + targetModel = targetProperty.parentModelNode(); + if (isShader) + insertIntoList("shaders", targetModel); + else + insertIntoList("commands", targetModel); + NodeAbstractProperty parentProp = targetProperty.parentProperty(); + if (parentProp.isValid()) { + targetProperty = parentProp; + targetModel = targetProperty.parentModelNode(); + targetRowNumber = rowCount(indexForModelNode(targetModel)); + + // Move node to new parent within the same transaction as we don't + // want undo to place the node under invalid parent + moveNodesAfter = false; + moveNodesInteractive(targetProperty, {newQmlObjectNode}, targetRowNumber, false); + } + } + } } } }); - if (newQmlObjectNode.isValid() && targetProperty.isNodeListProperty()) { + if (moveNodesAfter && newQmlObjectNode.isValid() && targetProperty.isNodeListProperty()) { QList newModelNodeList; newModelNodeList.append(newQmlObjectNode); @@ -646,11 +674,14 @@ void NavigatorTreeModel::handleItemLibraryImageDrop(const QMimeData *mimeData, i } } -void NavigatorTreeModel::moveNodesInteractive(NodeAbstractProperty &parentProperty, const QList &modelNodes, int targetIndex) +void NavigatorTreeModel::moveNodesInteractive(NodeAbstractProperty &parentProperty, + const QList &modelNodes, + int targetIndex, + bool executeInTransaction) { QTC_ASSERT(m_view, return); - m_view->executeInTransaction("NavigatorTreeModel::moveNodesInteractive",[&parentProperty, modelNodes, targetIndex](){ + auto doMoveNodesInteractive = [&parentProperty, modelNodes, targetIndex](){ const TypeName propertyQmlType = parentProperty.parentModelNode().metaInfo().propertyTypeName(parentProperty.name()); foreach (const ModelNode &modelNode, modelNodes) { if (modelNode.isValid() @@ -668,7 +699,12 @@ void NavigatorTreeModel::moveNodesInteractive(NodeAbstractProperty &parentProper } } } - }); + }; + + if (executeInTransaction) + m_view->executeInTransaction("NavigatorTreeModel::moveNodesInteractive", doMoveNodesInteractive); + else + doMoveNodesInteractive(); } Qt::DropActions NavigatorTreeModel::supportedDropActions() const diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h index 15e89d36367..3289a19b31a 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h @@ -92,7 +92,8 @@ public: void resetModel() override; private: - void moveNodesInteractive(NodeAbstractProperty &parentProperty, const QList &modelNodes, int targetIndex); + void moveNodesInteractive(NodeAbstractProperty &parentProperty, const QList &modelNodes, + int targetIndex, bool executeInTransaction = true); void handleInternalDrop(const QMimeData *mimeData, int rowNumber, const QModelIndex &dropModelIndex); void handleItemLibraryItemDrop(const QMimeData *mimeData, int rowNumber, const QModelIndex &dropModelIndex); void handleItemLibraryImageDrop(const QMimeData *mimeData, int rowNumber, const QModelIndex &dropModelIndex); From 30c55c063d9946de319821f52db6643a9375dc43 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 28 Aug 2020 09:12:24 +0200 Subject: [PATCH 19/37] Help/Android: Compile with namespaced Qt Task-number: QTCREATORBUG-24544 Change-Id: Id06cc623b8a0bfe365dda928cda52a97321732b2 Reviewed-by: Eike Ziller --- src/plugins/android/androidservicewidget.h | 2 ++ src/plugins/help/filtersettingspage.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/plugins/android/androidservicewidget.h b/src/plugins/android/androidservicewidget.h index cc30003b655..7a80234e4dd 100644 --- a/src/plugins/android/androidservicewidget.h +++ b/src/plugins/android/androidservicewidget.h @@ -29,8 +29,10 @@ #include #include +QT_BEGIN_NAMESPACE class QPushButton; class QTableView; +QT_END_NAMESPACE namespace Android { namespace Internal { diff --git a/src/plugins/help/filtersettingspage.h b/src/plugins/help/filtersettingspage.h index 6d98f096d87..469df0d23d2 100644 --- a/src/plugins/help/filtersettingspage.h +++ b/src/plugins/help/filtersettingspage.h @@ -32,7 +32,9 @@ #ifndef HELP_NEW_FILTER_ENGINE #include "ui_filtersettingspage.h" #else +QT_BEGIN_NAMESPACE class QHelpFilterSettingsWidget; +QT_END_NAMESPACE #endif namespace Help { From cfebe5a9da85078c4dcf1500a69c212517e2c35d Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 21 Aug 2020 15:43:24 +0200 Subject: [PATCH 20/37] Complete documentation on IDocument Change-Id: I72a62beaf6c8de0d2ae39a1c3c833708ca27b03f Reviewed-by: Leena Miettinen --- src/plugins/coreplugin/idocument.cpp | 475 +++++++++++++++++++++++---- src/plugins/coreplugin/idocument.h | 1 - 2 files changed, 420 insertions(+), 56 deletions(-) diff --git a/src/plugins/coreplugin/idocument.cpp b/src/plugins/coreplugin/idocument.cpp index 3e5f51cef79..4f4294d01a6 100644 --- a/src/plugins/coreplugin/idocument.cpp +++ b/src/plugins/coreplugin/idocument.cpp @@ -37,25 +37,175 @@ \inheaderfile coreplugin/idocument.h \inmodule QtCreator - \brief The IDocument class describes a document that can be saved and reloaded. + \brief The IDocument class describes a document that can be saved and + reloaded. - The most common use for implementing an IDocument subclass, is as a document for an IEditor - implementation. Multiple editors can work in the same document instance, so the IDocument - subclass should hold all data and functions that are independent from the specific - IEditor instance, for example the content, highlighting information, the name of the - corresponding file, and functions for saving and reloading the file. + The class has two use cases. - Each IDocument subclass works only with the corresponding IEditor subclasses that it - was designed to work with. + \section1 Handling External Modifications + + You can implement IDocument and register instances in DocumentManager to + let it handle external modifications of a file. When the file specified with + filePath() has changed externally, the DocumentManager asks the + corresponding IDocument instance what to do via reloadBehavior(). If that + returns \c IDocument::BehaviorAsk, the user is asked if the file should be + reloaded from disk. If the user requests the reload or reloadBehavior() + returns \c IDocument::BehaviorSilent, the DocumentManager calls reload() + to initiate a reload of the file from disk. + + Core functions: setFilePath(), reload(), reloadBehavior(). + + If the content of the document can change in \QC, diverging from the + content on disk: isModified(), save(), isSaveAsAllowed(), + fallbackSaveAsPath(), fallbackSaveAsFileName(). + + \section1 Editor Document + + The most common use case for implementing an IDocument subclass is as a + document for an IEditor implementation. Multiple editor instances can work + on the same document instance, for example if the document is visible in + multiple splits simultaneously. So the IDocument subclass should hold all + data that is independent from the specific IEditor instance, for example + the content and highlighting information. + + Each IDocument subclass is only required to work with the corresponding + IEditor subclasses that it was designed to work with. + + An IDocument can either be backed by a file, or solely represent some data + in memory. Documents backed by a file are automatically added to the + DocumentManager by the EditorManager. + + Core functions: setId(), isModified(), contents(), setContents(). + + If the content of the document is backed by a file: open(), save(), + setFilePath(), mimeType(), shouldAutoSave(), setSuspendAllowed(), and + everything from \l{Handling External Modifications}. + + If the content of the document is not backed by a file: + setPreferredDisplayName(), setTemporary(). \ingroup mainclasses */ /*! - \fn QString Core::IDocument::filePath() const - Returns the absolute path of the file that this document refers to. May be empty for - non-file documents. - \sa setFilePath() + \enum IDocument::OpenResult + + The OpenResult enum describes whether a file was successfully opened. + + \value Success + The file was read successfully and can be handled by this document + type. + \value ReadError + The file could not be opened for reading, either because it does not + exist or because of missing permissions. + \value CannotHandle + This document type could not handle the file content. +*/ + +/*! + \enum IDocument::ReloadSetting + + \internal +*/ + +/*! + \enum IDocument::ChangeTrigger + + The ChangeTrigger enum describes whether a file was changed from \QC + internally or from the outside. + + \value TriggerInternal + The file was changed by \QC. + \value TriggerExternal + The file was changed from the outside. + + \sa IDocument::reloadBehavior() +*/ + +/*! + \enum IDocument::ChangeType + + The ChangeType enum describes the way in which the file changed. + + \value TypeContents + The contents of the file changed. + \value TypePermissions + The file permissions changed. + \value TypeRemoved + The file was removed. + + \sa IDocument::reloadBehavior() + \sa IDocument::reload() +*/ + +/*! + \enum IDocument::ReloadFlag + + The ReloadFlag enum describes if a file should be reloaded from disk. + + \value FlagReload + The file should be reloaded. + \value FlagIgnore + The file should not be reloaded, but the document state should + reflect the change. + + \sa IDocument::reload() +*/ + +/*! + \fn Core::IDocument::changed() + + This signal is emitted when the document's meta data, like file name or + modified state, changes. + + \sa isModified() + \sa filePath() + \sa displayName() +*/ + +/*! + \fn Core::IDocument::contentsChanged() + + This signal is emitted when the document's content changes. + + \sa contents() +*/ + +/*! + \fn Core::IDocument::mimeTypeChanged() + + This signal is emitted when the document content's MIME type changes. + + \sa mimeType() +*/ + +/*! + \fn Core::IDocument::aboutToReload() + + This signal is emitted before the document is reloaded from the backing + file. + + \sa reload() +*/ + +/*! + \fn Core::IDocument::reloadFinished(bool success) + + This signal is emitted after the document is reloaded from the backing + file, or if reloading failed. + + The success state is passed in \a success. + + \sa reload() +*/ + +/*! + \fn Core::IDocument::filePathChanged(const Utils::FilePath &oldName, const Utils::FilePath &newName) + + This signal is emitted after the file path changed from \a oldName to \a + newName. + + \sa filePath() */ using namespace Utils; @@ -86,22 +236,51 @@ public: } // namespace Internal +/*! + Creates an IDocument with \a parent. + + \note Using the \a parent for ownership of the document is generally a + bad idea if the IDocument is intended for use with IEditor. It is better to + use shared ownership in that case. +*/ IDocument::IDocument(QObject *parent) : QObject(parent), d(new Internal::IDocumentPrivate) { } +/*! + Destroys the IDocument. + If there was an auto save file for this document, it is removed. + + \sa shouldAutoSave() +*/ IDocument::~IDocument() { removeAutoSaveFile(); delete d; } +/*! + \fn void IDocument::setId(Utils::Id id) + + Sets the ID for this document type to \a id. This is coupled with the + corresponding IEditor implementation and the \l{IEditorFactory::id()}{id()} + of the IEditorFactory. If the IDocument implementation only works with a + single IEditor type, this is preferably set in the IDocuments's + constructor. + + \sa id() +*/ void IDocument::setId(Id id) { d->id = id; } +/*! + Returns the ID for this document type. + + \sa setId() +*/ Id IDocument::id() const { QTC_CHECK(d->id.isValid()); @@ -109,30 +288,30 @@ Id IDocument::id() const } /*! - \enum IDocument::OpenResult - The OpenResult enum describes whether a file was successfully opened. + The open() method is used to load the contents of a file when a document is + opened in an editor. - \value Success - The file was read successfully and can be handled by this document type. - \value ReadError - The file could not be opened for reading, either because it does not exist or - because of missing permissions. - \value CannotHandle - This document type could not handle the file content. + If the document is opened from an auto save file, \a realFileName is the + name of the auto save file that should be loaded, and \a fileName is the + file name of the resulting file. In that case, the contents of the auto + save file should be loaded, the file name of the IDocument should be set to + \a fileName, and the document state be set to modified. + + If the editor is opened from a regular file, \a fileName and \a + realFileName are the same. + + Use \a errorString to return an error message if this document cannot + handle the file contents. + + Returns whether the file was opened and read successfully. + + The default implementation does nothing and returns + CannotHandle. + + \sa EditorManager::open() + \sa shouldAutoSave() + \sa setFilePath() */ - -/*! - * Used to load a file if this document is part of an IEditor implementation, when the editor - * is opened. - * If the editor is opened from an auto save file, \a realFileName is the name of the auto save - * that should be loaded, and \a fileName is the file name of the resulting file. - * In that case, the contents of the auto save file should be loaded, the file name of the - * IDocument should be set to \a fileName, and the document state be set to modified. - * If the editor is opened from a regular file, \a fileName and \a realFileName are the same. - * Use \a errorString to return an error message, if this document cannot handle the - * file contents. - * Returns whether the file was opened and read successfully. - */ IDocument::OpenResult IDocument::open(QString *errorString, const QString &fileName, const QString &realFileName) { Q_UNUSED(errorString) @@ -141,6 +320,21 @@ IDocument::OpenResult IDocument::open(QString *errorString, const QString &fileN return OpenResult::CannotHandle; } +/*! + Saves the contents of the document to the \a fileName on disk. + + If \a autoSave is \c true, the saving is done for an auto-save, so the + document should avoid cleanups or other operations that it does for + user-requested saves. + + Use \a errorString to return an error message if saving failed. + + Returns whether saving was successful. + + The default implementation does nothing and returns \c false. + + \sa shouldAutoSave() +*/ bool IDocument::save(QString *errorString, const QString &fileName, bool autoSave) { Q_UNUSED(errorString) @@ -150,21 +344,28 @@ bool IDocument::save(QString *errorString, const QString &fileName, bool autoSav } /*! - * Returns the current contents of the document. The base implementation returns an empty - * QByteArray. - */ + Returns the current contents of the document. The default implementation + returns an empty QByteArray. + + \sa setContents() + \sa contentsChanged() +*/ QByteArray IDocument::contents() const { return QByteArray(); } /*! - Used for example by EditorManager::openEditorWithContents() to set - the \a contents of this document. + The setContents() method is for example used by + EditorManager::openEditorWithContents() to set the \a contents of this + document. Returns whether setting the contents was successful. - The base implementation does nothing and returns false. + The default implementation does nothing and returns false. + + \sa contents() + \sa EditorManager::openEditorWithContents() */ bool IDocument::setContents(const QByteArray &contents) { @@ -172,20 +373,67 @@ bool IDocument::setContents(const QByteArray &contents) return false; } +/*! + Returns the absolute path of the file that this document refers to. May be + empty for documents that are not backed by a file. + + \sa setFilePath() +*/ const Utils::FilePath &IDocument::filePath() const { return d->filePath; } -IDocument::ReloadBehavior IDocument::reloadBehavior(ChangeTrigger state, ChangeType type) const +/*! + The reloadBehavior() method is used by the DocumentManager to ask what to + do if the file backing this document has changed on disk. + + The \a trigger specifies if the change was triggered by some operation in + \QC. The \a type specifies if the file changed permissions or contents, or + was removed completely. + + Returns whether the user should be asked or the document should be + reloaded silently. + + The default implementation requests a silent reload if only the permissions + changed or if the contents have changed but the \a trigger is internal and + the document is not modified. + + \sa isModified() +*/ +IDocument::ReloadBehavior IDocument::reloadBehavior(ChangeTrigger trigger, ChangeType type) const { if (type == TypePermissions) return BehaviorSilent; - if (type == TypeContents && state == TriggerInternal && !isModified()) + if (type == TypeContents && trigger == TriggerInternal && !isModified()) return BehaviorSilent; return BehaviorAsk; } +/*! + Reloads the document from the backing file when that changed on disk. + + If \a flag is FlagIgnore the file should not actually be loaded, but the + document should reflect the change in its \l{isModified()}{modified state}. + + The \a type specifies whether only the file permissions changed or if the + contents of the file changed. + + Use \a errorString to return an error message, if this document cannot + handle the file contents. + + Returns if the file was reloaded successfully. + + The default implementation does nothing and returns \c true. + + Subclasses should emit aboutToReload() before, and reloadFinished() after + reloading the file. + + \sa isModified() + \sa aboutToReload() + \sa reloadFinished() + \sa changed() +*/ bool IDocument::reload(QString *errorString, ReloadFlag flag, ChangeType type) { Q_UNUSED(errorString) @@ -194,35 +442,84 @@ bool IDocument::reload(QString *errorString, ReloadFlag flag, ChangeType type) return true; } +/*! + \internal +*/ void IDocument::checkPermissions() { } +/*! + Returns whether the document should automatically be saved at a user-defined + interval. + + The default implementation returns \c false. +*/ bool IDocument::shouldAutoSave() const { return false; } +/*! + Returns whether the document has been modified after it was loaded from a + file. + + The default implementation returns \c false. Re-implementations should emit + changed() when this property changes. + + \sa changed() +*/ bool IDocument::isModified() const { return false; } +/*! + Returns whether the document may be saved under a different file name. + + The default implementation returns \c false. + + \sa save() +*/ bool IDocument::isSaveAsAllowed() const { return false; } +/*! + Returns whether the document may be suspended. + + The EditorManager can automatically suspend editors and its corresponding + documents if the document is backed by a file, is not modified, and is not + temporary. Suspended IEditor and IDocument instances are deleted and + removed from memory, but are still visually accessible as if the document + was still opened in \QC. + + The default is \c false. + + \sa setSuspendAllowed() + \sa isModified() + \sa isTemporary() +*/ bool IDocument::isSuspendAllowed() const { return d->isSuspendAllowed; } +/*! + Sets whether the document may be suspended to \a value. + + \sa isSuspendAllowed() +*/ void IDocument::setSuspendAllowed(bool value) { d->isSuspendAllowed = value; } +/*! + Returns whether the file backing this document is read-only, or \c false if + the document is not backed by a file. +*/ bool IDocument::isFileReadOnly() const { if (filePath().isEmpty()) @@ -231,8 +528,12 @@ bool IDocument::isFileReadOnly() const } /*! - Returns if the document is a temporary that should for example not be considered - when saving/restoring the session state, recent files, etc. Defaults to false. + Returns if the document is temporary, and should for example not be + considered when saving or restoring the session state, or added to the recent + files list. + + The default is \c false. + \sa setTemporary() */ bool IDocument::isTemporary() const @@ -241,7 +542,8 @@ bool IDocument::isTemporary() const } /*! - Sets if the document is \a temporary. + Sets whether the document is \a temporary. + \sa isTemporary() */ void IDocument::setTemporary(bool temporary) @@ -249,21 +551,49 @@ void IDocument::setTemporary(bool temporary) d->temporary = temporary; } +/*! + Returns a path to use for the \uicontrol{Save As} file dialog in case the + document is not backed by a file. + + \sa fallbackSaveAsFileName() +*/ QString IDocument::fallbackSaveAsPath() const { return QString(); } +/*! + Returns a file name to use for the \uicontrol{Save As} file dialog in case + the document is not backed by a file. + + \sa fallbackSaveAsPath() +*/ QString IDocument::fallbackSaveAsFileName() const { return QString(); } +/*! + Returns the MIME type of the document content, if applicable. + + Subclasses should set this with setMimeType() after setting or loading + content. + + The default MIME type is empty. + + \sa setMimeType() + \sa mimeTypeChanged() +*/ QString IDocument::mimeType() const { return d->mimeType; } +/*! + Sets the MIME type of the document content to \a mimeType. + + \sa mimeType() +*/ void IDocument::setMimeType(const QString &mimeType) { if (d->mimeType != mimeType) { @@ -272,6 +602,9 @@ void IDocument::setMimeType(const QString &mimeType) } } +/*! + \internal +*/ bool IDocument::autoSave(QString *errorString, const QString &fileName) { if (!save(errorString, fileName, true)) @@ -282,6 +615,9 @@ bool IDocument::autoSave(QString *errorString, const QString &fileName) static const char kRestoredAutoSave[] = "RestoredAutoSave"; +/*! + \internal +*/ void IDocument::setRestoredFrom(const QString &name) { d->autoSaveName = name; @@ -292,6 +628,9 @@ void IDocument::setRestoredFrom(const QString &name) infoBar()->addInfo(info); } +/*! + \internal +*/ void IDocument::removeAutoSaveFile() { if (!d->autoSaveName.isEmpty()) { @@ -304,16 +643,26 @@ void IDocument::removeAutoSaveFile() } } +/*! + \internal +*/ bool IDocument::hasWriteWarning() const { return d->hasWriteWarning; } +/*! + \internal +*/ void IDocument::setWriteWarning(bool has) { d->hasWriteWarning = has; } +/*! + Returns the document's Utils::InfoBar, which is shown at the top of an + editor. +*/ Utils::InfoBar *IDocument::infoBar() { if (!d->infoBar) @@ -322,10 +671,13 @@ Utils::InfoBar *IDocument::infoBar() } /*! - Set absolute file path for this file to \a filePath. Can be empty. - The default implementation sets the file name and sends filePathChanged() and changed() - signals. Can be reimplemented by subclasses to do more. + Sets the absolute \a filePath of the file that backs this document. The + default implementation sets the file name and sends the filePathChanged() and + changed() signals. + \sa filePath() + \sa filePathChanged() + \sa changed() */ void IDocument::setFilePath(const Utils::FilePath &filePath) { @@ -338,10 +690,10 @@ void IDocument::setFilePath(const Utils::FilePath &filePath) } /*! - Returns the string to display for this document, in the open document combo - box and pane, for example. + Returns the string to display for this document, for example in the + \uicontrol{Open Documents} view and the documents drop down. - The returned string has the following priority: + The display name is one of the following, in order: \list 1 \li Unique display name set by the document model @@ -350,6 +702,8 @@ void IDocument::setFilePath(const Utils::FilePath &filePath) \endlist \sa setPreferredDisplayName() + \sa filePath() + \sa changed() */ QString IDocument::displayName() const { @@ -357,11 +711,10 @@ QString IDocument::displayName() const } /*! - Sets the string that is displayed for this document, e.g. in the open document combo box - and pane, to \a name. Defaults to the file name of the file path for this document. - You can reset the display name to the default by passing an empty string. + Sets the preferred display \a name for this document. + + \sa preferredDisplayName() \sa displayName() - \sa filePath() */ void IDocument::setPreferredDisplayName(const QString &name) { @@ -371,6 +724,15 @@ void IDocument::setPreferredDisplayName(const QString &name) emit changed(); } +/*! + Returns the preferred display name for this document. + + The default preferred display name is empty, which means that the display + name is preferably the file name of the file backing this document. + + \sa setPreferredDisplayName() + \sa displayName() +*/ QString IDocument::preferredDisplayName() const { return d->preferredDisplayName; @@ -394,6 +756,9 @@ void IDocument::setUniqueDisplayName(const QString &name) d->uniqueDisplayName = name; } +/*! + \internal +*/ QString IDocument::uniqueDisplayName() const { return d->uniqueDisplayName; diff --git a/src/plugins/coreplugin/idocument.h b/src/plugins/coreplugin/idocument.h index c2a7e90cf80..66a95a8b49a 100644 --- a/src/plugins/coreplugin/idocument.h +++ b/src/plugins/coreplugin/idocument.h @@ -88,7 +88,6 @@ public: void setId(Utils::Id id); Utils::Id id() const; - // required to be re-implemented for documents of IEditors virtual OpenResult open(QString *errorString, const QString &fileName, const QString &realFileName); virtual bool save(QString *errorString, const QString &fileName = QString(), bool autoSave = false); From 25ab750e3ade13633e56f0313b19b7e9fd4ff59e Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 28 Aug 2020 10:27:59 +0200 Subject: [PATCH 21/37] qmake: Prevent injection of empty values via environment variables The qmake $() operator retrieves environment values at make time. In Qt Creator, we still use these values for feeding the code model, presumably because the qmake and make step share a common environment. However, we must take care that unset environment values do not lead to empty strings in qmake lists, as that can have unwanted side effects, especially when these lists get turned into command line arguments that are passed to build tools. A concrete example: A project file contained the following assignment: QMAKE_CXXFLAGS += $(SOME_VAR) SOME_VAR was not set in the environment, so an additional empty argument appeared on the command line when the code model called the MSVC compiler to retrieve some information required for parsing the code. The call failed, the code model had to fall back to default values, and the user got parsing errors. Fixes: QTCREATORBUG-21729 Change-Id: I224369a2fb9c0dd78406253edba03bd44556be44 Reviewed-by: Joerg Bornemann --- src/shared/proparser/profileevaluator.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp index 3b816f01cd3..f6b2d3c5f31 100644 --- a/src/shared/proparser/profileevaluator.cpp +++ b/src/shared/proparser/profileevaluator.cpp @@ -71,8 +71,11 @@ QStringList ProFileEvaluator::values(const QString &variableName) const const ProStringList &values = d->values(ProKey(variableName)); QStringList ret; ret.reserve(values.size()); - foreach (const ProString &str, values) - ret << d->m_option->expandEnvVars(str.toQString()); + for (const ProString &str : values) { + const QString expanded = d->m_option->expandEnvVars(str.toQString()); + if (!expanded.isEmpty() || str.isEmpty()) + ret << expanded; + } return ret; } From 488637599477053ca44f9228f396981a72dfa343 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 28 Aug 2020 09:56:31 +0200 Subject: [PATCH 22/37] QmlDesigner: Fix compilation with namespaced Qt Task-number: QTCREATORBUG-24544 Change-Id: I9f16bf9a454f5b97ac6581274b0b08421b24c4da Reviewed-by: Eike Ziller --- .../qmldesigner/assetexporterplugin/assetexportdialog.h | 4 +--- .../qmldesigner/assetexporterplugin/assetexportdialog.ui | 4 ++-- .../qmldesigner/assetexporterplugin/assetexporterview.h | 2 ++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.h b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.h index e452fff6bcb..197a91b5ab1 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.h +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.h @@ -39,9 +39,6 @@ class QListView; class QPlainTextEdit; QT_END_NAMESPACE -namespace Ui { -class AssetExportDialog; -} namespace Utils { class OutputFormatter; @@ -52,6 +49,7 @@ class Task; } namespace QmlDesigner { +namespace Ui { class AssetExportDialog; } class FilePathModel; class AssetExportDialog : public QDialog diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.ui b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.ui index a4e7ec91d9c..0f51525b6b8 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.ui +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.ui @@ -1,7 +1,7 @@ - AssetExportDialog - + QmlDesigner::AssetExportDialog + 0 diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.h b/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.h index 46c2c77071a..9efbc19cec0 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.h +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.h @@ -83,4 +83,6 @@ private: } +QT_BEGIN_NAMESPACE QDebug operator<<(QDebug os, const QmlDesigner::AssetExporterView::LoadState &s); +QT_END_NAMESPACE From b41ea232332dd8d95140169e557aa8ad51770245 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 28 Aug 2020 08:48:48 +0200 Subject: [PATCH 23/37] Meson: Compile fix for namespaced Qt Task-number: QTCREATORBUG-24544 Change-Id: I5a6ff7f561aca0b967471f4532e32a05077e3939 Reviewed-by: Eike Ziller --- .../project/buildoptions/mesonbuildsettingswidget.h | 6 +++--- .../project/buildoptions/mesonbuildsettingswidget.ui | 4 ++-- .../settings/general/generalsettingswidget.h | 7 +++---- .../settings/general/generalsettingswidget.ui | 4 ++-- .../mesonprojectmanager/settings/tools/toolitemsettings.h | 5 +---- .../settings/tools/toolitemsettings.ui | 4 ++-- .../settings/tools/toolssettingswidget.h | 8 +++----- .../settings/tools/toolssettingswidget.ui | 4 ++-- 8 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.h b/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.h index d3b9ab51185..68f677c41f0 100644 --- a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.h +++ b/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.h @@ -32,12 +32,12 @@ #include #include -namespace Ui { -class MesonBuildSettingsWidget; -} namespace MesonProjectManager { namespace Internal { + +namespace Ui { class MesonBuildSettingsWidget; } + class MesonBuildConfiguration; class MesonBuildSettingsWidget : public ProjectExplorer::NamedWidget { diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.ui b/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.ui index f5a80ee0475..6efac5a04f2 100644 --- a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.ui +++ b/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.ui @@ -1,7 +1,7 @@ - MesonBuildSettingsWidget - + MesonProjectManager::Internal::MesonBuildSettingsWidget + 0 diff --git a/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.h b/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.h index cf0da678e5c..d16e6ec7559 100644 --- a/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.h +++ b/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.h @@ -30,12 +30,11 @@ #include #include -namespace Ui { -class GeneralSettingsWidget; -} - namespace MesonProjectManager { namespace Internal { + +namespace Ui { class GeneralSettingsWidget; } + class GeneralSettingsWidget final : public Core::IOptionsPageWidget { Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::GeneralSettingsWidget) diff --git a/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.ui b/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.ui index 8f44e3df74a..6323bf302e6 100644 --- a/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.ui +++ b/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.ui @@ -1,7 +1,7 @@ - GeneralSettingsWidget - + MesonProjectManager::Internal::GeneralSettingsWidget + 0 diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h b/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h index 9a692b00c13..988add23bef 100644 --- a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h +++ b/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h @@ -29,13 +29,10 @@ #include "utils/optional.h" #include -namespace Ui { -class ToolItemSettings; -} - namespace MesonProjectManager { namespace Internal { +namespace Ui { class ToolItemSettings; } class ToolTreeItem; class ToolItemSettings : public QWidget diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.ui b/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.ui index 60a93dca1a4..5e1b2a59539 100644 --- a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.ui +++ b/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.ui @@ -1,7 +1,7 @@ - ToolItemSettings - + MesonProjectManager::Internal::ToolItemSettings + 0 diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.h b/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.h index 9c1bd5231f1..26739e88b9e 100644 --- a/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.h +++ b/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.h @@ -34,13 +34,11 @@ #include #include - -namespace Ui { -class ToolsSettingsWidget; -} - namespace MesonProjectManager { namespace Internal { + +namespace Ui { class ToolsSettingsWidget; } + class ToolTreeItem; class ToolsSettingsWidget final : public Core::IOptionsPageWidget { diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.ui b/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.ui index 7cc3da0b83a..ed6409ab138 100644 --- a/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.ui +++ b/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.ui @@ -1,7 +1,7 @@ - ToolsSettingsWidget - + MesonProjectManager::Internal::ToolsSettingsWidget + 0 From b55cc282646427ec7021e7de7972c3f9e41768db Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 27 Aug 2020 23:51:56 +0300 Subject: [PATCH 24/37] LLDB: Append 2 newlines after commands For some reason, sometimes LLDB misses the first character of the next command on Windows. Task-number: QTCREATORBUG-14539 Change-Id: Ide78e0a0aa64ea4cbcaf6b55a0acdd548a1fa46c Reviewed-by: hjk Reviewed-by: Eike Ziller --- src/plugins/debugger/lldb/lldbengine.cpp | 15 +++++++++++---- src/plugins/debugger/lldb/lldbengine.h | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp index 03c6bdf7fa4..f7026b2815f 100644 --- a/src/plugins/debugger/lldb/lldbengine.cpp +++ b/src/plugins/debugger/lldb/lldbengine.cpp @@ -151,7 +151,7 @@ void LldbEngine::runCommand(const DebuggerCommand &command) } showMessage(msg, LogInput); m_commandForToken[currentToken()] = cmd; - m_lldbProc.write("script theDumper." + function.toUtf8() + "\n"); + executeCommand("script theDumper." + function.toUtf8()); } void LldbEngine::debugLastCommand() @@ -168,6 +168,13 @@ void LldbEngine::handleAttachedToCore() updateLocals(); } +void LldbEngine::executeCommand(const QByteArray &command) +{ + // For some reason, sometimes LLDB misses the first character of the next command on Windows + // if passing only 1 LF. + m_lldbProc.write(command + "\n\n"); +} + void LldbEngine::shutdownInferior() { QTC_ASSERT(state() == InferiorShutdownRequested, qDebug() << state()); @@ -228,13 +235,13 @@ void LldbEngine::setupEngine() const QByteArray dumperSourcePath = ICore::resourcePath().toLocal8Bit() + "/debugger/"; - m_lldbProc.write("script sys.path.insert(1, '" + dumperSourcePath + "')\n"); + executeCommand("script sys.path.insert(1, '" + dumperSourcePath + "')"); // This triggers reportState("enginesetupok") or "enginesetupfailed": - m_lldbProc.write("script from lldbbridge import *\n"); + executeCommand("script from lldbbridge import *"); QString commands = nativeStartupCommands(); if (!commands.isEmpty()) - m_lldbProc.write(commands.toLocal8Bit() + '\n'); + executeCommand(commands.toLocal8Bit()); const QString path = stringSetting(ExtraDumperFile); diff --git a/src/plugins/debugger/lldb/lldbengine.h b/src/plugins/debugger/lldb/lldbengine.h index 6c5b3c2c21c..e33db0e963a 100644 --- a/src/plugins/debugger/lldb/lldbengine.h +++ b/src/plugins/debugger/lldb/lldbengine.h @@ -131,6 +131,7 @@ private: void runCommand(const DebuggerCommand &cmd) override; void debugLastCommand() override; void handleAttachedToCore(); + void executeCommand(const QByteArray &command); private: DebuggerCommand m_lastDebuggableCommand; From 6181399187214eaf72327314205e516699a96e04 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 25 Aug 2020 09:44:15 +0200 Subject: [PATCH 25/37] Doc: Use local value for \QMLD macro in Qt Design Studio Manual This enables us to get rid of the product name "Qt Quick Designer" in Qt Design Studio context. However, the macro can no longer be used for UI text. Actually, it does not make much sense, because the UI text is not dynamic. It would be good to also replace it in the UI with something more generic, or with "Form Editor", for example. Change-Id: I5884f090f915d5ff0c64428239bfd324cd1941c2 Reviewed-by: Brook Cronin Reviewed-by: Thomas Hartmann --- .../qtquick/creator-only/qtquick-modules-with-plugins.qdoc | 2 +- doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc | 6 +++--- doc/qtcreator/src/qtquick/qtquick-properties.qdoc | 2 +- doc/qtdesignstudio/config/qtdesignstudio.qdocconf | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc index c37643d7bbc..abb3dec1082 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc @@ -162,7 +162,7 @@ To use an emulation layer that is built with the Qt configured in the build and run kit for the project, select \uicontrol Tools > - \uicontrol Options > \uicontrol {Qt Quick} > \uicontrol {\QMLD} > + \uicontrol Options > \uicontrol {Qt Quick} > \uicontrol {Qt Quick Designer} > \uicontrol {Use QML emulation layer which is built by the selected Qt} radio button. \QC builds the emulation layer when you select the Design mode. diff --git a/doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc b/doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc index 3d963cf7dda..487ae507233 100644 --- a/doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc @@ -63,7 +63,7 @@ button to anchor the item to the items that you snap to. Choose \uicontrol Tools > \uicontrol Options > \uicontrol {Qt Quick} > - \uicontrol {\QMLD} to specify settings for snapping. In the + \uicontrol {Qt Quick Designer} to specify settings for snapping. In the \uicontrol {Parent item padding} field, specify the distance in pixels between the parent item and the snapping lines. In the \uicontrol {Sibling item spacing} field, specify the distance in pixels between @@ -99,14 +99,14 @@ \image qmldesigner-preview-size.png "Canvas width and height" To set the initial size of the root item, select \uicontrol Tools > - \uicontrol Options > \uicontrol {Qt Quick} > \uicontrol {\QMLD} and + \uicontrol Options > \uicontrol {Qt Quick} > \uicontrol {Qt Quick Designer} and specify the item width and height in the \uicontrol {Root Item Init Size} group. \section1 Specifying Canvas Size To change the canvas size, select \uicontrol Tools > \uicontrol Options > - \uicontrol {Qt Quick} > \uicontrol {\QMLD} and + \uicontrol {Qt Quick} > \uicontrol {Qt Quick Designer} and specify the canvas width and height in the \uicontrol Canvas group. \section1 Refreshing the Form Editor Contents diff --git a/doc/qtcreator/src/qtquick/qtquick-properties.qdoc b/doc/qtcreator/src/qtquick/qtquick-properties.qdoc index b26107ca2a4..b356ac9633b 100644 --- a/doc/qtcreator/src/qtquick/qtquick-properties.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-properties.qdoc @@ -185,7 +185,7 @@ If you use text IDs instead of plain text, change the default call to \c qsTrId(). Select \uicontrol Tools > \uicontrol Options > - \uicontrol {Qt Quick} > \uicontrol {\QMLD}, and then select the + \uicontrol {Qt Quick} > \uicontrol {Qt Quick Designer}, and then select the \uicontrol {qsTrId()} radio button in the \uicontrol Internationalization group. For more information about text ID based translations, see \l {Qt Linguist Manual: Text ID Based Translations}. diff --git a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf index b3ba0453814..b8d7f0659e6 100644 --- a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf +++ b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf @@ -112,6 +112,7 @@ qhp.qtdesignstudio.subprojects.manual.type = manual # Doxygen compatibility commands macro.see = "\\sa" macro.function = "\\fn" +macro.QMLD = "Qt Design Studio" navigation.landingpage = "$IDE_DISPLAY_NAME Manual" buildversion = "$IDE_DISPLAY_NAME Manual $QTC_VERSION" From 5ac01be9347678950ff623a5fe86d1290a10395a Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Thu, 27 Aug 2020 09:16:02 +0200 Subject: [PATCH 26/37] Doc: Drop BareMetal from the requirements list In addition, drop the instructions to enable or disable a plugin. It is already documented else where and is less relevant in this context. Fixes: QTCREATORBUG-24531 Change-Id: Icd1f46333e1d1f64ff24ab0b2eb1e571d533e5ed Reviewed-by: Leena Miettinen --- doc/qtcreator/src/mcu/creator-mcu-dev.qdoc | 23 ++++------------------ 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc index 96fb05b6971..399524ddce7 100644 --- a/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc +++ b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc @@ -55,7 +55,6 @@ \list \li Qt for MCU SDK (only available for Windows) - \li The Bare Metal plugin \li \l{https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm} {GNU ARM Embedded Toolchain} \endlist @@ -74,25 +73,11 @@ between \QC and MCUs. The following subsections guide you through the setup process. - \section2 MCU and Bare Metal Plugins + \section2 MCU Plugin - To be able to develop applications for MCUs, you need the MCU plugin at least. - This plugin is enabled automatically by the installer when you install the - Qt for MCUs SDK. - - The Bare Metal plugin is optional unless you want to configure the - debug server provider settings explicitly. For more information - see \l{Connecting Bare Metal Devices}. - - To explicitly disable or enable any of these plugins, follow these - instructions: - \list 1 - \li Select \uicontrol Help > \uicontrol {About Plugins} > - \uicontrol {Device Support} > \uicontrol {Bare Metal} and - \uicontrol {MCU Support} to enable the Bare Metal and MCU - plugins. - \li Select \uicontrol {Restart Now} to restart \QC and load the plugins. - \endlist + To be able to develop applications for MCUs, you need the MCU plugin. + This plugin is enabled automatically by the Qt online installer when + you install the Qt for MCUs SDK. \section2 Specifying MCU Settings From 2f6d0a1ad32feb625805e05b97009d86fd9ee574 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 28 Aug 2020 12:43:44 +0200 Subject: [PATCH 27/37] QmlDesigner: Fix compile of tests Change-Id: If791e1e2eb7c9b4d04c13ecd5db531abef9069fa Reviewed-by: Aleksei German Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/designercore/model/qmlstate.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugins/qmldesigner/designercore/model/qmlstate.cpp b/src/plugins/qmldesigner/designercore/model/qmlstate.cpp index 4a38985ad1b..ea15ba1d819 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlstate.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlstate.cpp @@ -33,7 +33,6 @@ #include "qmlchangeset.h" #include "qmlitemnode.h" #include "annotation.h" -#include "annotationeditor/annotationeditor.h" #include From ee281afa733ee0cf9a6a23d648485961da995678 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 25 Aug 2020 13:24:05 +0300 Subject: [PATCH 28/37] QmlDesigner: Support dragging images to TextureInputs Dragging an image to TextureInput item creates a new Texture item at the same level as the TextureInput and binds TextureInput.texture property to the newly created texture. Any existing texture binding is overwritten. Task-number: QDS-2657 Change-Id: I79cf1a11608914ded4b868336a7d1a9c83071d87 Reviewed-by: Thomas Hartmann Reviewed-by: Mahmoud Badri --- .../navigator/navigatortreemodel.cpp | 38 ++++++++++++++----- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index 4671f94bf68..f86b3779335 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -634,9 +634,8 @@ void NavigatorTreeModel::handleItemLibraryImageDrop(const QMimeData *mimeData, i ModelNode newModelNode; - if (targetNode.isSubclassOf("QtQuick3D.Material")) { - // if dropping an image on a default material, create a texture instead of image - m_view->executeInTransaction("QmlItemNode::createQmlItemNode", [&] { + auto createTextureNode = [&](const NodeAbstractProperty &targetProp) -> bool { + if (targetProp.isValid()) { // create a texture item lib ItemLibraryEntry itemLibraryEntry; itemLibraryEntry.setName("Texture"); @@ -649,14 +648,33 @@ void NavigatorTreeModel::handleItemLibraryImageDrop(const QMimeData *mimeData, i itemLibraryEntry.addProperty(prop, type, val); // create a texture - newModelNode = QmlItemNode::createQmlObjectNode(m_view, itemLibraryEntry, {}, targetProperty, false); + newModelNode = QmlItemNode::createQmlObjectNode(m_view, itemLibraryEntry, {}, targetProp, false); + return newModelNode.isValid(); + } + return false; + }; - // Automatically set the texture to default property - // TODO: allow the user to choose which map property to set the texture for (QDS-2326) - if (targetNode.isSubclassOf("QtQuick3D.DefaultMaterial")) - targetNode.bindingProperty("diffuseMap").setExpression(newModelNode.validId()); - else if (targetNode.isSubclassOf("QtQuick3D.PrincipledMaterial")) - targetNode.bindingProperty("baseColorMap").setExpression(newModelNode.validId()); + if (targetNode.isSubclassOf("QtQuick3D.Material")) { + // if dropping an image on a default material, create a texture instead of image + m_view->executeInTransaction("NavigatorTreeModel::handleItemLibraryImageDrop", [&] { + if (createTextureNode(targetProperty)) { + // Automatically set the texture to default property + // TODO: allow the user to choose which map property to set the texture for (QDS-2326) + if (targetNode.isSubclassOf("QtQuick3D.DefaultMaterial")) + targetNode.bindingProperty("diffuseMap").setExpression(newModelNode.validId()); + else if (targetNode.isSubclassOf("QtQuick3D.PrincipledMaterial")) + targetNode.bindingProperty("baseColorMap").setExpression(newModelNode.validId()); + } + }); + } else if (targetNode.isSubclassOf("QtQuick3D.TextureInput")) { + // If dropping an image on a TextureInput, create a texture on the same level as + // TextureInput, as the TextureInput doesn't support Texture children (QTBUG-86219) + m_view->executeInTransaction("NavigatorTreeModel::handleItemLibraryImageDrop", [&] { + NodeAbstractProperty parentProp = targetProperty.parentProperty(); + if (createTextureNode(parentProp)) { + // Automatically set the texture to texture property + targetNode.bindingProperty("texture").setExpression(newModelNode.validId()); + } }); } else if (targetNode.isSubclassOf("QtQuick3D.Texture")) { // if dropping an image on a texture, set the texture source From 024eeee74528a4e9e500234b8fb2f2c8e1d941d7 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 28 Aug 2020 15:37:32 +0200 Subject: [PATCH 29/37] QmlDesigner: Enable Timeline for MCU, but blacklist FlowView Task-number: QDS-2681 Change-Id: I1b4eb312ce88e1ee7bf052020fd4e9d5cf95021c Reviewed-by: Aleksei German Reviewed-by: Thomas Hartmann --- .../components/importmanager/importswidget.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/components/importmanager/importswidget.cpp b/src/plugins/qmldesigner/components/importmanager/importswidget.cpp index 650033a42d8..4d8f134d903 100644 --- a/src/plugins/qmldesigner/components/importmanager/importswidget.cpp +++ b/src/plugins/qmldesigner/components/importmanager/importswidget.cpp @@ -99,12 +99,16 @@ void ImportsWidget::setPossibleImports(QList possibleImports) QList filteredImports; - const QStringList mcuWhiteList = {"QtQuick", "QtQuick.Controls"}; + const QStringList mcuWhiteList = {"QtQuick", "QtQuick.Controls", "QtQuick.Timeline"}; + const QStringList mcuBlackList = {"FlowView"}; if (isQtForMCUs) { - filteredImports = Utils::filtered(possibleImports, [mcuWhiteList](const Import &import) { - return mcuWhiteList.contains(import.url()) || !import.url().startsWith("Qt"); - }); + filteredImports = Utils::filtered(possibleImports, + [mcuWhiteList, mcuBlackList](const Import &import) { + return (mcuWhiteList.contains(import.url()) + || !import.url().startsWith("Qt")) + && !mcuBlackList.contains(import.url()); + }); } else { filteredImports = possibleImports; } From 688f78552dbdfc168e96061d45d909afec3e038d Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 28 Aug 2020 15:38:53 +0200 Subject: [PATCH 30/37] QmlDesigner: Update properties supported by MCU The transform properties are only available for Image and Text. Task-number: QDS-2512 Change-Id: I7c3eb6cb07182afe1e9d307bb5d210f1f2cf9c9f Reviewed-by: Aleksei German Reviewed-by: Thomas Hartmann --- .../propertyeditor/propertyeditorvalue.cpp | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp index b2f44710ade..62de72ad056 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp @@ -260,19 +260,36 @@ bool PropertyEditorValue::isTranslated() const return false; } +static bool itemOrImage(const QmlDesigner::NodeMetaInfo &metaInfo) +{ + if (!metaInfo.isValid()) + return false; + + if (metaInfo.isSubclassOf("QtQuick.Image") || metaInfo.isSubclassOf("QtQuick.Text")) + return true; + + return false; +} + bool PropertyEditorValue::isAvailable() const { - const QList mcuProperties = {"layer", "opacity", "rotation", "scale", "gradient", - "transformOrigin", "smooth", "antialiasing", "border"}; + const QList mcuProperties = {"layer", "opacity", "gradient", "smooth", "antialiasing"}; + + const QList mcuTransformProperties = {"rotation", "scale", "transformOrigin"}; + const QList list = name().split('.'); const QByteArray pureName = list.first(); - QmlDesigner::DesignDocument *designDocument = - QmlDesigner::QmlDesignerPlugin::instance()->documentManager().currentDesignDocument(); + QmlDesigner::DesignDocument *designDocument = QmlDesigner::QmlDesignerPlugin::instance() + ->documentManager() + .currentDesignDocument(); - - if (designDocument && designDocument->isQtForMCUsProject()) - return !mcuProperties.contains(pureName); + if (designDocument && designDocument->isQtForMCUsProject()) { + if (mcuProperties.contains(pureName)) + return false; + if (mcuTransformProperties.contains(pureName) && !itemOrImage(m_modelNode.metaInfo())) + return false; + } return true; } From a981df3bf641b691293c14ca7ff35a2d8457c721 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 31 Aug 2020 07:42:27 +0200 Subject: [PATCH 31/37] More namespaced Qt Amends b41ea232332dd8d95140169e557aa8ad51770245. Missed that because the file is gone in master. Task-number: QTCREATORBUG-24544 Change-Id: I7e5948d564c370f9ed197d999778151f2fe61b38 Reviewed-by: Christian Stenger --- .../project/buildoptions/mesonbuildstepconfigwidget.h | 6 +++--- .../project/buildoptions/mesonbuildstepconfigwidget.ui | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.h b/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.h index b0cc6fb9d83..a479d108ca8 100644 --- a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.h +++ b/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.h @@ -28,11 +28,11 @@ #include #include -namespace Ui { -class MesonBuildStepConfigWidget; -} namespace MesonProjectManager { namespace Internal { + +namespace Ui { class MesonBuildStepConfigWidget; } + class MesonBuildStepConfigWidget final : public ProjectExplorer::BuildStepConfigWidget { Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::MesonBuildStepConfigWidget) diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.ui b/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.ui index 1212227fb76..84f2e8171a3 100644 --- a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.ui +++ b/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.ui @@ -1,7 +1,7 @@ - MesonBuildStepConfigWidget - + MesonProjectManager::Internal::MesonBuildStepConfigWidget + 0 From 72406c69ce288f6c656f242b46aa6dbca782c792 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 31 Aug 2020 08:18:13 +0200 Subject: [PATCH 32/37] QmlDesigner: More compile with namespaced Qt Amends 4886375994. Compiles for me without. Change-Id: Iaccbe6a2000d1b87008496f0e515a94aa7955061 Reviewed-by: Christian Stenger --- .../qmldesigner/assetexporterplugin/assetexporterview.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp index e651599b80e..f3cfee4de9d 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp @@ -154,8 +154,10 @@ void AssetExporterView::handleTimerTimeout() } +QT_BEGIN_NAMESPACE QDebug operator<<(QDebug os, const QmlDesigner::AssetExporterView::LoadState &s) { os << static_cast::type>(s); return os; } +QT_END_NAMESPACE From 431667925e7c8c2cbe6f57789625c7548e6859a0 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Fri, 28 Aug 2020 16:10:50 +0200 Subject: [PATCH 33/37] QmlDesigner: Update StateEditor layout * Add alias properties to StudioControls AbstractButton * Add color to StudioControls theme * Update StateEditor layout due to issue with default label placement Task-number: QDS-2623 Task-number: QDS-2615 Change-Id: If46daab2293d42dff7d73c4cf9a0c370442c5694 Reviewed-by: Brook Cronin Reviewed-by: Thomas Hartmann --- .../imports/StudioControls/AbstractButton.qml | 3 + .../imports/StudioTheme/Values.qml | 2 + .../statesEditorQmlSources/StatesDelegate.qml | 232 +++++++++++------- .../statesEditorQmlSources/StatesList.qml | 73 +++--- 4 files changed, 189 insertions(+), 121 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml index 4d95bb7083c..629d482a206 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml @@ -33,6 +33,9 @@ T.AbstractButton { property alias buttonIcon: buttonIcon.text property alias iconColor: buttonIcon.color property alias iconFont: buttonIcon.font.family + property alias iconSize: buttonIcon.font.pixelSize + property alias iconItalic: buttonIcon.font.italic + property alias iconBold: buttonIcon.font.bold property alias backgroundVisible: buttonBackground.visible property alias backgroundRadius: buttonBackground.radius diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml index dfba7236bf6..22f0ff872ef 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml @@ -122,6 +122,8 @@ QtObject { property string themeTabDark: Theme.color(Theme.QmlDesigner_TabDark) property string themeTabLight: Theme.color(Theme.QmlDesigner_TabLight) + property string themeStateDefaultHighlight: "#ffe400" + // Taken out of Constants.js property string themeChangedStateText: Theme.color(Theme.DSchangedStateText) diff --git a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml index 6b01f322f85..f4faae6bbe4 100644 --- a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml +++ b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator. @@ -24,6 +24,7 @@ ****************************************************************************/ import QtQuick 2.15 +import QtQuick.Layouts 1.15 import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 import StudioControls 1.0 as StudioControls @@ -32,7 +33,8 @@ import StudioTheme 1.0 as StudioTheme Rectangle { id: myRoot - border.width: 1 + color: baseColor + property bool isBaseState property bool isCurrentState property color baseColor @@ -42,13 +44,19 @@ Rectangle { property bool delegateHasWhenCondition property string delegateWhenConditionString property bool hasAnnotation: checkAnnotation() + property int topAreaHeight + property int bottomAreaHeight + property int stateMargin + property int previewMargin + property int columnSpacing readonly property bool isDefaultState: isDefault - signal delegateInteraction + property int closeButtonMargin: 6 + property int textFieldMargin: 4 + property int highlightBorderWidth: 2 - color: baseColor - border.color: Theme.qmlDesignerBorderColor() + signal delegateInteraction function autoComplete(text, pos, explicitComplete, filter) { var stringList = statesEditorModel.autoComplete(text, pos, explicitComplete) @@ -62,7 +70,6 @@ Rectangle { MouseArea { id: mouseArea anchors.fill: parent - acceptedButtons: Qt.LeftButton onClicked: { focus = true @@ -74,11 +81,15 @@ Rectangle { StudioControls.AbstractButton { id: removeStateButton + buttonIcon: StudioTheme.Constants.closeCross + anchors.right: parent.right - anchors.rightMargin: 4 - anchors.verticalCenter: stateNameField.verticalCenter - visible: !isBaseState + anchors.rightMargin: myRoot.closeButtonMargin + anchors.top: parent.top + anchors.topMargin: myRoot.closeButtonMargin + + visible: !isBaseState && isCurrentState onClicked: { myRoot.delegateInteraction() @@ -156,98 +167,135 @@ Rectangle { } - StudioControls.TextField { - id: stateNameField - - actionIndicator.onClicked: { - stateNameField.actionIndicator.forceVisible = true - contextMenu.popup() - } - - onEditChanged: { - if (contextMenu.open && stateNameField.edit) - contextMenu.dismiss() - } - - actionIndicator.icon.text: delegateHasWhenCondition - ? StudioTheme.Constants.actionIconBinding : StudioTheme.Constants.actionIcon - - translationIndicatorVisible: false - y: 4 - anchors.left: parent.left - // use the spacing which the image to the delegate rectangle has - anchors.leftMargin: 4 - anchors.right: removeStateButton.left - anchors.rightMargin: 2 - - readOnly: isBaseState - - onActiveFocusChanged: { - if (activeFocus) - root.currentStateInternalId = internalNodeId - } - - Component.onCompleted: { - text = delegateStateName - } - - property string oldValue - - onEditingFinished: { - if (stateNameField.oldValue === stateNameField.text) - return - - stateNameField.oldValue = stateNameField.text - - if (stateNameField.text !== delegateStateName) - statesEditorModel.renameState(internalNodeId, stateNameField.text) - } + Rectangle { + anchors.margins: (isDefaultState || (isBaseState && !modelHasDefaultState)) ? -myRoot.highlightBorderWidth : 0 + anchors.fill: column + color: Theme.color(Theme.DSsliderActiveTrackFocus) + border.color: StudioTheme.Values.themeStateDefaultHighlight + border.width: (isDefaultState || (isBaseState && !modelHasDefaultState)) ? myRoot.highlightBorderWidth : 0 } - Item { - id: stateImageArea - anchors.topMargin: 2 - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: stateNameField.bottom - height: delegateStateImageSize + 2 - width: delegateStateImageSize + 2 + Column { + id: column + + anchors.margins: myRoot.stateMargin + anchors.fill: parent + spacing: expanded ? myRoot.columnSpacing : 0 - visible: expanded Rectangle { - anchors.margins: -1 - anchors.fill: stateImage - border.width: 1 - border.color: Theme.qmlDesignerBackgroundColorDarker() + + width: myRoot.width - 2 * myRoot.stateMargin + height: myRoot.topAreaHeight + + color: Theme.color(Theme.DShoverHighlight) + + StudioControls.TextField { + id: stateNameField + + property string oldValue + + width: StudioTheme.Values.height * 7 + + anchors.top: parent.top + anchors.topMargin: myRoot.textFieldMargin + anchors.left: parent.left + anchors.leftMargin: myRoot.textFieldMargin + + translationIndicatorVisible: false + readOnly: isBaseState + + actionIndicator.icon.text: delegateHasWhenCondition + ? StudioTheme.Constants.actionIconBinding + : StudioTheme.Constants.actionIcon + + + actionIndicator.onClicked: { + stateNameField.actionIndicator.forceVisible = true + contextMenu.popup() + } + + onEditChanged: { + if (contextMenu.open && stateNameField.edit) + contextMenu.dismiss() + } + + onActiveFocusChanged: { + if (activeFocus) + root.currentStateInternalId = internalNodeId + } + + onEditingFinished: { + if (stateNameField.oldValue === stateNameField.text) + return + + stateNameField.oldValue = stateNameField.text + + if (stateNameField.text !== myRoot.delegateStateName) + statesEditorModel.renameState(internalNodeId, stateNameField.text) + } + + Component.onCompleted: { + text = myRoot.delegateStateName + } + } + + Text { + id: stateDefaultIndicator + + anchors.right: parent.right + anchors.rightMargin: myRoot.previewMargin + anchors.verticalCenter: stateNameField.verticalCenter + + color: Theme.color(Theme.DStextColor) + font.italic: true + font.pixelSize: StudioTheme.Values.myFontSize + font.family: StudioTheme.Constants.font + + visible: (isDefaultState || (isBaseState && !modelHasDefaultState)) + + text: qsTr("Default") + } } - Image { - id: stateImage - anchors.centerIn: parent - source: delegateStateImageSource - sourceSize.width: delegateStateImageSize - sourceSize.height: delegateStateImageSize + + + Rectangle { + id: stateImageArea + + width: myRoot.width - 2 * myRoot.stateMargin + height: myRoot.bottomAreaHeight + + color: Theme.color(Theme.DShoverHighlight) + + visible: expanded + + Rectangle { + border.width: StudioTheme.Values.border + border.color: Theme.color(Theme.DSsliderActiveTrackFocus) + color: Theme.color(Theme.DSsliderInactiveTrack) + + anchors.centerIn: parent + + width: Math.round(stateImage.paintedWidth) + 2 * StudioTheme.Values.border + height: Math.round(stateImage.paintedHeight) + 2 * StudioTheme.Values.border + } + Image { + id: stateImage + + anchors.margins: myRoot.previewMargin + anchors.centerIn: parent + anchors.fill: parent + source: delegateStateImageSource + sourceSize.width: delegateStateImageSize + sourceSize.height: delegateStateImageSize + fillMode: Image.PreserveAspectFit + } } } - Text { - id: stateDefaultIndicator - anchors.left: parent.left - anchors.leftMargin: StudioTheme.Values.height - anchors.right: removeStateButton.left - anchors.rightMargin: 4 - anchors.bottom: parent.bottom - anchors.bottomMargin: 4 - - color: Theme.color(Theme.PanelTextColorLight) - font.italic: true - font.pixelSize: Theme.smallFontPixelSize() - - visible: expanded && (isDefaultState || (isBaseState && !modelHasDefaultState)) - - text: ("* " + qsTr("Default")) - } - BindingEditor { + id: bindingEditor + property string newWhenCondition property Timer timer: Timer { @@ -258,8 +306,6 @@ Rectangle { onTriggered: statesEditorModel.setWhenCondition(internalNodeId, bindingEditor.newWhenCondition) } - id: bindingEditor - stateModelNodeProperty: statesEditorModel.stateModelNode() onRejected: { diff --git a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml index 8eb80fbfc66..4abaa896d2f 100644 --- a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml +++ b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator. @@ -33,16 +33,29 @@ import StudioTheme 1.0 as StudioTheme FocusScope { id: root - height: (root.expanded ? 192 : 40) + StudioTheme.Values.scrollBarThickness + property int delegateTopAreaHeight: 30 + property int delegateBottomAreaHeight: 200 + property int delegateColumnSpacing: 2 + property int delegateStateMargin: 16 + property int delegatePreviewMargin: 16 + + height: (root.expanded ? (root.delegateTopAreaHeight + root.delegateBottomAreaHeight + root.delegateColumnSpacing) + : root.delegateTopAreaHeight) + + StudioTheme.Values.scrollBarThickness + + 2 * (root.delegateStateMargin + StudioTheme.Values.border + root.padding) + signal createNewState signal deleteState(int internalNodeId) signal duplicateCurrentState - property int stateImageSize: 180 + property int stateImageSize: 200 property int padding: 2 - property int delegateWidth: root.stateImageSize + 44 - property int delegateHeight: root.height - StudioTheme.Values.scrollBarThickness - root.padding * 2 + 1 - property int innerSpacing: 0 + property int delegateWidth: root.stateImageSize + + 2 * (root.delegateStateMargin + root.delegatePreviewMargin) + property int delegateHeight: root.height + - StudioTheme.Values.scrollBarThickness + - 2 * (root.padding + StudioTheme.Values.border) + property int innerSpacing: 2 property int currentStateInternalId: 0 property bool expanded: true @@ -59,7 +72,7 @@ FocusScope { Rectangle { id: background anchors.fill: parent - color: Theme.qmlDesignerBackgroundColorDarkAlternate() + color: Theme.color(Theme.QmlDesigner_BackgroundColorDarkAlternate) } MouseArea { @@ -95,7 +108,7 @@ FocusScope { Item { id: addStateItem - property int buttonLeftSpacing: 8 * (root.expanded ? 1 : 2) + property int buttonLeftSpacing: 8 * (root.expanded ? 1 : 2) anchors.right: parent.right width: root.delegateHeight / 2 + buttonLeftSpacing @@ -103,37 +116,35 @@ FocusScope { AbstractButton { id: addStateButton - visible: canAddNewStates + buttonIcon: root.expanded ? qsTr("Create New State") : StudioTheme.Constants.plus + iconFont: root.expanded ? StudioTheme.Constants.font : StudioTheme.Constants.iconFont + iconSize: root.expanded ? StudioTheme.Values.myFontSize : StudioTheme.Values.myIconFontSize + iconItalic: root.expanded ? true : false tooltip: qsTr("Add a new state.") - + visible: canAddNewStates anchors.right: parent.right anchors.rightMargin: 8 anchors.verticalCenter: parent.verticalCenter width: Math.max(parent.height / 2 - 8, 18) - height: width + height: root.expanded ? 80 : width onClicked: { root.closeContextMenu() root.createNewState() } - - background: Rectangle { - property color buttonBaseColor: Qt.darker(Theme.qmlDesignerBackgroundColorDarkAlternate(), 1.1) - color: addStateButton.hovered ? Qt.lighter(buttonBaseColor, 1.2) : buttonBaseColor - border.color: Theme.qmlDesignerBorderColor() - border.width: 1 - Image { - source: "image://icons/plus" - width: 16 - height: 16 - anchors.centerIn: parent - smooth: false - } - } } } + Rectangle { + color: Theme.color(Theme.DSsliderActiveTrackFocus) + x: root.padding + y: root.padding + width: Math.min((root.delegateWidth * flickable.count) + (2 * (flickable.count - 1)), + flickable.width) + height: root.delegateHeight + } + ListView { id: flickable @@ -155,15 +166,21 @@ FocusScope { id: statesDelegate width: root.delegateWidth height: root.delegateHeight - isBaseState: 0 == internalNodeId - isCurrentState: root.currentStateInternalId == internalNodeId - baseColor: isCurrentState ? Theme.color(Theme.QmlDesigner_HighlightColor) : background.color + isBaseState: 0 === internalNodeId + isCurrentState: root.currentStateInternalId === internalNodeId + baseColor: isCurrentState ? Theme.color(Theme.DSinteraction) : background.color delegateStateName: stateName delegateStateImageSource: stateImageSource delegateStateImageSize: stateImageSize delegateHasWhenCondition: hasWhenCondition delegateWhenConditionString: whenConditionString onDelegateInteraction: root.closeContextMenu() + + columnSpacing: root.delegateColumnSpacing + topAreaHeight: root.delegateTopAreaHeight + bottomAreaHeight: root.delegateBottomAreaHeight + stateMargin: root.delegateStateMargin + previewMargin: root.delegatePreviewMargin } property bool bothVisible: horizontal.scrollBarVisible && vertical.scrollBarVisible From 29ca7de368b76219676d61756cd26ccc97c99781 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 31 Aug 2020 11:52:02 +0300 Subject: [PATCH 34/37] QmlDesigner: Reset puppet after removing SLConnector Changing imports resets the puppet before SLConnector gets removed, causing puppet load to fail. Added additional resetPuppet call after SLConnector removal to ensure puppet is loaded correctly. Change-Id: Ia26bbcbd39fe4c59a4795fa0052d0adedac789b7 Fixes: QDS-2662 Reviewed-by: Mahmoud Badri --- .../qmldesigner/components/itemlibrary/itemlibraryview.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp index ea2e472f43d..82306a5ab70 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp @@ -113,6 +113,8 @@ void ItemLibraryView::importsChanged(const QList &addedImports, const QL for (ModelNode node : slConnectors) node.destroy(); + + resetPuppet(); } } } From 81b4e63bdab440bdde579ba35dec435919be1190 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 27 Aug 2020 13:29:00 +0200 Subject: [PATCH 35/37] WinRt: Fix BuildStep soft assert Change-Id: Iee7290796737b629c7241ef441099a449f0fae5c Reviewed-by: Oliver Wolff --- src/plugins/winrt/winrtpackagedeploymentstep.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/winrt/winrtpackagedeploymentstep.cpp b/src/plugins/winrt/winrtpackagedeploymentstep.cpp index 1a45fb92a08..5e7acefaf96 100644 --- a/src/plugins/winrt/winrtpackagedeploymentstep.cpp +++ b/src/plugins/winrt/winrtpackagedeploymentstep.cpp @@ -225,7 +225,9 @@ bool WinRtPackageDeploymentStep::init() return false; } params->setCommandLine(windeployqt); - params->setEnvironment(buildEnvironment()); + params->setEnvironment(target()->activeBuildConfiguration() + ? target()->activeBuildConfiguration()->environment() + : Environment::systemEnvironment()); return AbstractProcessStep::init(); } From 48bfe882e030f1037da943f814135e0898f33eaf Mon Sep 17 00:00:00 2001 From: Vikas Pachdha Date: Wed, 12 Aug 2020 11:56:09 +0200 Subject: [PATCH 36/37] AssetExport: Export the metadata oustside the project directory Name the metadata file after the project being exported Task-number: QDS-2612 Change-Id: Ia073f6969708f2ed89552dfc7a38305563e2bef2 Reviewed-by: Thomas Hartmann --- .../qmldesigner/assetexporterplugin/assetexporter.cpp | 7 ++++++- .../assetexporterplugin/assetexporterplugin.cpp | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp index 1ea1e09e923..b975c228e67 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp @@ -32,6 +32,8 @@ #include "utils/qtcassert.h" #include "utils/runextensions.h" #include "variantproperty.h" +#include "projectexplorer/session.h" +#include "projectexplorer/project.h" #include #include @@ -239,7 +241,10 @@ void AssetExporter::writeMetadata() const return; } - Utils::FilePath metadataPath = m_exportPath.pathAppended(m_exportPath.fileName() + ".metadata"); + auto const startupProject = ProjectExplorer::SessionManager::startupProject(); + QTC_ASSERT(startupProject, return); + const QString projectName = startupProject->displayName(); + Utils::FilePath metadataPath = m_exportPath.pathAppended(projectName + ".metadata"); ExportNotification::addInfo(tr("Writing metadata to file %1."). arg(metadataPath.toUserOutput())); makeParentPath(metadataPath); diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.cpp index e45e48ca0db..5c42411443e 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.cpp @@ -95,8 +95,10 @@ void AssetExporterPlugin::onExport() return; FilePathModel model(startupProject); - QString exportDirName = startupProject->displayName() + "_export"; - auto exportDir = startupProject->projectFilePath().parentDir().pathAppended(exportDirName); + auto exportDir = startupProject->projectFilePath().parentDir(); + if (!exportDir.parentDir().isEmpty()) + exportDir = exportDir.parentDir(); + exportDir = exportDir.pathAppended(startupProject->displayName() + "_export"); AssetExporter assetExporter(m_view, startupProject); AssetExportDialog assetExporterDialog(exportDir, assetExporter, model); assetExporterDialog.exec(); From e8eafd85eea5201504d305fcdc68ba324bbd4715 Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Fri, 28 Aug 2020 12:30:06 +0200 Subject: [PATCH 37/37] Doc: Update the MCU options dialog screenshot Also, fix the broken link to the Qt for MCUs supported platforms page. Change-Id: If0a0702b0821e2e46eca2ad57676c53cb20040e2 Reviewed-by: Alessandro Portale --- .../images/qtcreator-mcu-options.png | Bin 11098 -> 12096 bytes .../external-resources.qdoc | 2 +- doc/qtcreator/src/mcu/creator-mcu-dev.qdoc | 3 +++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/qtcreator/images/qtcreator-mcu-options.png b/doc/qtcreator/images/qtcreator-mcu-options.png index 5d8758a8e113dfa0843832e1465f2138fee1d3c9..4dab2f9a2abbcdb3397a95c14e906dff12e6962b 100644 GIT binary patch literal 12096 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 literal 11098 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 diff --git a/doc/qtcreator/src/external-resources/external-resources.qdoc b/doc/qtcreator/src/external-resources/external-resources.qdoc index e74ee2897b6..ba06b3cc3d9 100644 --- a/doc/qtcreator/src/external-resources/external-resources.qdoc +++ b/doc/qtcreator/src/external-resources/external-resources.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \externalpage https://doc.qt.io/QtForMCUs/qtul-environment.html + \externalpage https://doc.qt.io/QtForMCUs/qtul-supported-platforms.html \title Qt for MCUs - Supported Target Platforms */ /*! diff --git a/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc index 399524ddce7..3673f97b195 100644 --- a/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc +++ b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc @@ -100,11 +100,14 @@ \list \li The \uicontrol {GNU ARM Embedded Toolchain} path. \li The \uicontrol {STM32CubeProgrammer} install path. + \li The \uicontrol {MCU SDK} for the chosen target. \endlist \li For NXP targets: \list \li The \uicontrol {GNU ARM Embedded Toolchain} path. \li The \uicontrol {MCUXpresso IDE} install path. + \li The \uicontrol {MCU SDK} for the chosen target. + \li The \uicontrol {FreeRTOS Sources} for the chosen target. \endlist \li For Renesas targets: \list