summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprojectmanager
Commit message (Collapse)AuthorAgeFilesLines
* Use SPDX license identifiersLucie Gérard2022-08-2644-1060/+88
| | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlPropjectManager: Fix ownershipMarco Bubke2022-08-264-37/+53
| | | | | | | | | Explicit ownership has the advatage that you can see if you leak memory. Removed overused casting too. Change-Id: I2336aa07525742d6c1415471ea15ed101406a90c Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QDS: Fix unused variable warningsMarcus Tillmanns2022-08-181-2/+0
| | | | | | | Change-Id: I3ea21d5883cb75dd2507ad3d0aa6b3e24ed8354e Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* FilePath: Remove ::toDir() and deprecation hintsMarcus Tillmanns2022-08-042-6/+5
| | | | | Change-Id: Ib561c019e3fd44cd85504ad4286eb3759ce19516 Reviewed-by: hjk <hjk@qt.io>
* Utils: Make port.h slimmerhjk2022-07-271-0/+1
| | | | | | | | Fix the fallout. Also make comparisons hidden friends. Change-Id: Ib16a294391f5732f94f9f411a48220b497691de2 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Merge remote-tracking branch 'origin/8.0'Eike Ziller2022-07-251-0/+4
|\ | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp Change-Id: I1ed3dd86fe5b4b87e3015c41652f5d0fa16d7070
| * QmlDesigner: Prefer autodected kits and use replacment kits only as fallbackThomas Hartmann2022-07-221-0/+4
| | | | | | | | | | | | | | | | | | In QDS we want to priotize the kits we provide as part of the installation. Change-Id: I282166bce811b6777088cd0dcde31dd8da785e2b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | filesystem: Add QFSEngine for filepathsMarcus Tillmanns2022-07-212-3/+3
| | | | | | | | | | Change-Id: Ibd0c88c69863c0877138d8cc45541530c359bd9c Reviewed-by: hjk <hjk@qt.io>
* | QmlProjectManager: Improve font loading for the QDS landing pageAlessandro Portale2022-07-212-1/+1
| | | | | | | | | | | | | | | | | | | | | | The Titillium Web font comes in a QML module with FontLoader. Use that instead of QFontDataBase, and retrieve the exact family name. This also ensures that the font is loaded when editing the page in QDS (if it is not loaded before e.g. by the QDS Welcome Screen). Change-Id: I2cbec7fbc09fb4d4d31c513441c7cabbbbc5001d Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
* | Drop Qt5: Qml lib / QmlDesigner: Get rid of QOverloadJarek Kobus2022-07-201-2/+1
| | | | | | | | | | | | | | | | Add a context object into some lambdas. Change-Id: I16ee7a0c061483e4d90c9e015852c41a4f3cde90 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | Merge remote-tracking branch 'origin/8.0'Eike Ziller2022-07-202-5/+9
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/plugins/todo/optionsdialog.cpp src/plugins/todo/todoprojectsettingswidget.cpp Change-Id: I24ca90c2fc2cd707df901d42694df6d0e27d696d
| * QmlProject: Disable or hide qmlproject related actionsThomas Hartmann2022-07-202-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | Generate CMake Build files is only relevant for .qmlprojects and should only be enabled for those. Export as latest Project Format is only relevant for QDS and should be hidden in Qt Creator. Task-number: QTCREATORBUG-27935 Change-Id: Iac6ca6927443a92dfb501f76c855fd641aaf10da Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | qmljs: (QString -> Utils::FilePath)++Fawzi Mohamed2022-07-132-7/+19
| | | | | | | | | | | | | | | | | | convert more QString containing paths to Utils::FilePath Change-Id: I1219d7d147993e48cfa641dc9bea72ab38c90f51 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | Merge remote-tracking branch 'origin/8.0'Eike Ziller2022-07-121-0/+5
|\ \ | |/ | | | | Change-Id: I37a1f78caf9ae258c6b052efa3be15b3dbcbe164
| * QmlProject: Allow only one project in QDSThomas Hartmann2022-07-121-0/+5
| | | | | | | | | | | | | | | | | | This keeps project management simple. Having multiple projects open often leads to confusion. Change-Id: If6344732cf2813ea8ccf6a1a790229d1038ec240 Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/8.0'Eike Ziller2022-07-041-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/qmldesigner/qmldesignerprojectmanager.cpp Change-Id: I5106bb632c2a3a144287097137be45b0894b9ee4
| * DesignModeContext: Don't leak context on shutdownJarek Kobus2022-07-011-1/+1
| | | | | | | | | | | | | | | | Make passed widget a parent of the context. Fixes: QTCREATORBUG-27570 Change-Id: Ifbc9db8d5b3fb95566e2c6b83df9c10d02f7c0e5 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/8.0'Eike Ziller2022-06-295-8/+8
|\ \ | |/ | | | | Change-Id: I552d201d09d62d21655176467088c6e48b8a2fe2
| * QmlProjectPlugin: Don't leak action on shutdownJarek Kobus2022-06-295-8/+8
| | | | | | | | | | | | | | | | Detected by memory analyzer. Change-Id: I5c1ba80e9a1e1ca620b496ebe6cd9bb600e8b800 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Add plugintr.h files to all pluginshjk2022-06-273-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Except FakeVim, which had it before. for i in [a-eg-z]*/*.json ; do upper=${i##*/} upper=${upper/.json/} lower=${i%/*} trfile=$lower/${lower}tr.h cat << EOT > $lower/${lower}tr.h /**************************************************************************** ** ** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator. ** ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU ** General Public License version 3 as published by the Free Software ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT ** included in the packaging of this file. Please review the following ** information to ensure the GNU General Public License requirements will ** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ****************************************************************************/ namespace $upper { struct Tr { Q_DECLARE_TR_FUNCTIONS($upper) }; } // namespace $upper EOT git add $trfile perl -pi -e "s/(${lower}_global.h)/\1\n ${lower}tr.h/" $lower/CMakeLists.txt perl -pi -e "s/(\"${lower}_global.h\",)/\1 \"${lower}tr.h\",/" $lower/$lower.qbs done Change-Id: I15ebbaaa9443c57b391b9e143f592d8a0c9208a9 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/8.0'Eike Ziller2022-06-2712-132/+174
|\ \ | |/ | | | | Change-Id: Ia1c97d5949de607177a5a0632c7e8a37cbfd3475
| * Code cosmeticshjk2022-06-244-3/+4
| | | | | | | | | | | | | | | | | | | | Mostly unused #include's, also sort them or reduce scope. A few namespaces, ... Change-Id: I9ee71e07de7157c9942125672addf87dd41e78f1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
| * QmlProjectManager: Update landing pageHenning Gruendl2022-06-248-129/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | * Make landing page responsive * Use QtCreator welcome page theme colors * Remove CMake from landing page * Separate colors from values to make mocking data less redundant * Add quick version to qt version check * Use qml singleton for backend instead of using the root context item Change-Id: Ic303d4713c348e34197716031b303720702f3e98 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/qmlprojectstorage'Tim Jenssen2022-06-212-0/+21
|/ | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/qmldesignerprojectmanager.cpp src/plugins/qmlprojectmanager/qmlproject.cpp src/plugins/qmlprojectmanager/qmlproject.h Change-Id: I0c0d59c8e3b8455b6ac575d34fdf49f39388db7a Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlProjectMananger: Remove a use of mimeType via QFileInfohjk2022-06-151-8/+5
| | | | | | | | | And a bit cosmetics. Change-Id: I3e64b661d86cadad22422c2bffad0ed1262283b4 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* QmlProjectManager: Fix crash when building with Qt5Christian Stenger2022-06-141-6/+8
| | | | | Change-Id: Id5af5b6dfe4613f2a0669febee4622944854a999 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlProjectManager: Fix compileChristian Stenger2022-06-101-1/+1
| | | | | | | Amends 82911d2ec30f3a1. Change-Id: I31bb8d88911837fca117ea76f8c474c555f9e59e Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlProjectManager: Add .qmlproject file generatorTapani Mattila2022-06-109-13/+455
| | | | | | Task-number: QDS-6993 Change-Id: I033b0efeea87e8eab3238d3ce8d5f25752822e36 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlProjectManager: Load QDS landing page content when it is neededTapani Mattila2022-06-083-47/+97
| | | | | | | Task-number: QTCREATORBUG-27583 Change-Id: Ib329816f7282b0c6f88d78d62a0c9f34c961e509 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* QMLPlugins: Remove foreach / Q_FOREACH usageArtem Sokolovskii2022-06-013-4/+7
| | | | | | | Task-number: QTCREATORBUG-27464 Change-Id: Ie3e3ec9fdaea856943e5325cabd21e52bf290e70 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QmlProjectManager: Fix buildChristian Stenger2022-05-251-1/+1
| | | | | | | Amends f55fc5276b9. Change-Id: I5a6119c85639e1c0c240041fa36679063db72402 Reviewed-by: David Schulz <david.schulz@qt.io>
* QmlProjectManager: Add theming support to QDS landing pageTapani Mattila2022-05-255-0/+107
| | | | | | | Task-number: QDS-6897 Change-Id: I2e1cea556d906d59664cb72612ea1d67ef495f4f Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Merge remote-tracking branch 'origin/7.0'Eike Ziller2022-05-231-1/+1
|\ | | | | | | Change-Id: I7037b2b400617b0be0e1a010dd293e4f96d77328
| * QmlProject: Fix typoThomas Hartmann2022-05-181-1/+1
| | | | | | | | | | Change-Id: Ie376933f2a83b0d5ceb22ad1b0e335d052c08135 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Utils: Pass MacroExpander to ArgumentsAspect constructorhjk2022-05-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | In the past we wanted to keep the aspect constructor simple but it turned out that exceptions were needed and accumulating, so those are likely here to stay. By passing also the MacroExpander to the ArgumentsAspect constructor allows other single-purpose warts like the ProjectConfiguration::doPostInit() machinery can be removed. Change-Id: I148b0ca1ab0740270eecd0d3134620de65a86d4f Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | QmlDesigner: Move CMake generator to QmlProjectManagerTapani Mattila2022-05-1925-0/+2465
| | | | | | | | | | | | Task-number: QDS-6898 Change-Id: Ib1ca2ff4cd17a1ee6c203878a963bf44bac6969b Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge "Merge remote-tracking branch 'origin/7.0'"The Qt Project2022-05-185-54/+278
|\ \
| * \ Merge remote-tracking branch 'origin/7.0'Eike Ziller2022-05-185-54/+278
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: src/plugins/qmlprojectmanager/qmlprojectplugin.cpp Change-Id: I14030f58303839e706af892dd12a67566e3bed68
| | * QmlProject: Allow setting main qml file and main ui.qml fileThomas Hartmann2022-05-175-51/+276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The .qmlproject file already has the "mainFile" setting which indicates which qml file is run. This patch adds a main ui.qml file that indicates which ui.qml file is opened in the design mode if the .qmlproject is opened. The patch also adds two context menu actions that allow setting the main qml and main.ui.qml files without having to edit the .qmlproject file by hand. Changing the main ui.qml file also checks if the current ui.qml file is used as in the main qml file and if it is, then we switch the component there. For now the actions are only available in QDS. Task-number: QDS-6882 Change-Id: I1c6e19c039036dc635161fa6e06173356dc509aa Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | | QmlProjectManager: Fix CMake build with absent Qt5::QuickWidgetsAlessandro Portale2022-05-181-0/+1
|/ / | | | | | | | | Change-Id: Ic6c211a629bc4e5f215abad0bd80c6edb64f5c5d Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | QmlProjectManager: Do not establish connecttions when using Qt5Christian Stenger2022-05-181-5/+7
| | | | | | | | | | | | | | Amends 8bb1a862a06. Change-Id: I4186dda881f06295788e1fe4d6165c999fdbe574 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | QmlProjectManager: Fix build with QbsChristian Stenger2022-05-181-1/+1
| | | | | | | | | | | | | | Amends 8bb1a862a06. Change-Id: I6fedc5f5dd1d505790bf0a27319250f274a3d895 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Remove algorithm.h from buildtargetinfo.hJarek Kobus2022-05-182-0/+2
| | | | | | | | | | | | | | Change-Id: I777212fb94d46c1c71f017288b7e38dd5db62a91 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | QmlProjectManager: Integrate QDS landing pageTapani Mattila2022-05-177-83/+412
| | | | | | | | | | | | Task-number: QDS-6564 Change-Id: Ia1a4188ba1bb561bbfeadf5fb29bcba75d05b5ce Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | QmlProjectManager: Fix compile with Qt5.15Christian Stenger2022-05-161-1/+1
| | | | | | | | | | | | | | Amends 92c93c388a9. Change-Id: Iff025dbf7feb6c84dd7eb88ccea14e8e12e69a2f Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | QmlProject: Move project file pattern searches from StudioWelcome plugin to ↵Tapani Mattila2022-05-165-1/+186
| | | | | | | | | | | | | | | | QmlProject plugin Task-number: QDS-6930 Change-Id: I63345b539efdafa754671aef46ad808999914edb Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | QmlProjectManager: Fix compiler warningEike Ziller2022-05-111-1/+1
| | | | | | | | | | | | | | Remove unused lambda capture Change-Id: I4b17b8330f8ed4f5463f36689366d314e0159046 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | CMake: Qt Creator Static build supportCristian Adam2022-04-292-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the build system feature that allows Qt Creator's libraries and plugins to be compiled statically. Fixes some symbol clashes when all plugins are linked into the same executable. Support for actually loading static plugins will be added in a separate commit. The feature is controlled by QTC_STATIC_BUILD which by default is OFF. Change-Id: I1fab7953c43e42dc75619e35660029ee067106df Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/7.0'Eike Ziller2022-04-204-0/+44
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/plugins/webassembly/webassemblyrunconfiguration.cpp src/tools/processlauncher/launchersockethandler.cpp Change-Id: Iab052af98013aa59282c16f22ae6e9ecb32f50c4
| * QmlDesigner: Add configuration for qsb shader generator toolMiikka Heikkinen2022-04-084-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added default ShaderTool configuration block to new project template and use information specified there to generate qsb shaders. The args property specifies command line argument for qsb tool. The files property specifies files for which qsb tool is run for. E.g.: ShaderTool { args: "-s --glsl \"100 es,120,150\" --hlsl 50 --msl 12" files: [ "content/shaders/*" ] } Fixes: QDS-6590 Change-Id: I3bab0db21d20f486f9f25c1437a27ddb7fb47396 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
View Lorry Controller Status