From f4c9c8e07a7d8172b807890ee5f673cce59eadcb Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 20 Apr 2020 11:26:35 +0200 Subject: [PATCH 01/41] QtSupport: Work around OpenBSD's idiosyncratic naming scheme Fixes: QTCREATORBUG-23818 Change-Id: I0b2ec8621224dbfbe1a1e2c5990a9c168573dc8e Reviewed-by: Christian Stenger --- src/plugins/qtsupport/baseqtversion.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 7c1a3c241d4..67cc6b8699b 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -2034,6 +2034,9 @@ FilePaths BaseQtVersionPrivate::qtCorePaths() else if (file.endsWith(".dll") || file.endsWith(QString::fromLatin1(".so.") + versionString) || file.endsWith(".so") +#if defined(Q_OS_OPENBSD) + || file.contains(QRegularExpression("\\.so\\.[0-9]+\\.[0-9]+$")) // QTCREATORBUG-23818 +#endif || file.endsWith(QLatin1Char('.') + versionString + ".dylib")) dynamicLibs.append(FilePath::fromFileInfo(info)); } From 4df0e1f4af6aee7b726493d19d5fae551a006bd6 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 22 Apr 2020 16:03:39 +0200 Subject: [PATCH 02/41] Doc: Add missing dot Change-Id: I20c6f4709eea0e9e7cbf04401b4499d403deaedb Reviewed-by: Leena Miettinen --- doc/qtcreator/src/qtquick/qtquick-components.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/qtcreator/src/qtquick/qtquick-components.qdoc b/doc/qtcreator/src/qtquick/qtquick-components.qdoc index 15124c30499..f5bf4b1cb43 100644 --- a/doc/qtcreator/src/qtquick/qtquick-components.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-components.qdoc @@ -64,7 +64,7 @@ The \uicontrol {Qt Quick Application} wizards for a particular platform add the import statements automatically. You can remove import statements in - \uicontrol {QML Imports} + \uicontrol {QML Imports}. \uicontrol {Assets} displays the images and other files that you copy to the project folder (to the same subfolder as the QML files). From 252a0431d126ea85a83b67ae266f2d3387d8bd0b Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 21 Apr 2020 11:33:59 +0200 Subject: [PATCH 03/41] Debugger: Fix dumper for std::unique_ptr with custom deleter Task-number: QTCREATORBUG-23885 Change-Id: Ifba6ef7233886d1c9341e7912d6924cd9afbc4eb Reviewed-by: Christian Stenger --- share/qtcreator/debugger/stdtypes.py | 5 ++++- tests/auto/debugger/tst_dumpers.cpp | 14 ++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/share/qtcreator/debugger/stdtypes.py b/share/qtcreator/debugger/stdtypes.py index c6693f70b69..b08b9d603de 100644 --- a/share/qtcreator/debugger/stdtypes.py +++ b/share/qtcreator/debugger/stdtypes.py @@ -800,7 +800,10 @@ def qdump__std____1__shared_ptr(d, value): def qdump__std__unique_ptr(d, value): - p = d.extractPointer(value) + if value.type.size() == d.ptrSize(): + p = d.extractPointer(value) + else: + _, p = value.split("pp"); # For custom deleters. if p == 0: d.putValue("(null)") d.putNumChild(0) diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 684c076ff27..9bbd10b2669 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -4706,14 +4706,19 @@ void tst_Dumpers::dumper_data() QTest::newRow("StdUniquePtr") << Data("#include \n" - "#include \n" + fooData, + "#include \n" + fooData + + + "static Foo *alloc_foo() { return new Foo; }\n" + "static void free_foo(Foo *f) { delete f; }\n", "std::unique_ptr p0;\n\n" "std::unique_ptr p1(new int(32));\n\n" "std::unique_ptr p2(new Foo);\n\n" - "std::unique_ptr p3(new std::string(\"ABC\"));", + "std::unique_ptr p3(new std::string(\"ABC\"));\n" - "&p0, &p1, &p2, &p3") + "std::unique_ptr p4{alloc_foo(), free_foo};", + + "&p0, &p1, &p2, &p3, &p4") + CoreProfile() + Cxx11Profile() @@ -4722,7 +4727,8 @@ void tst_Dumpers::dumper_data() + Check("p0", "(null)", "std::unique_ptr >") + Check("p1", "32", "std::unique_ptr >") + Check("p2", Pointer(), "std::unique_ptr >") - + Check("p3", "\"ABC\"", "std::unique_ptr >"); + + Check("p3", "\"ABC\"", "std::unique_ptr >") + + Check("p4.b", "2", "int"); QTest::newRow("StdOnce") From 7bf3024a566cd27ada873877cfe50f110736296f Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 22 Apr 2020 16:06:49 +0200 Subject: [PATCH 04/41] Doc: Update info about the Timeline view and curve editors - Remove information about enabling the Timeline view, because it is now enabled by default - Update the screenshot to show the animation curve editor icon - Show information about previewing, which is now enabled - Fix UI text for the animation curve editor Change-Id: I288b45f521945aadf76475871f422ccb41cd1ac1 Reviewed-by: Thomas Hartmann --- doc/qtcreator/images/studio-timeline.png | Bin 26259 -> 13712 bytes .../src/qtquick/qtquick-components.qdoc | 2 + .../src/qtquick/qtquick-timeline.qdoc | 38 +++++++----------- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/doc/qtcreator/images/studio-timeline.png b/doc/qtcreator/images/studio-timeline.png index e5743e068bde759a1482d6de7692477290ed8688..49557eeaaed8102c0c8c46a5de997d903e7ff47d 100644 GIT binary patch literal 13712 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 \uicontrol Options > \uicontrol {Qt Quick} > - \uicontrol {Qt Quick Designer} > \uicontrol {Enable Timeline editor}. - Select \uicontrol {Restart Now} to restart \QC with the \uicontrol Timeline - view visible. - To be able to create timelines, you also need the \l {Qt Quick Timeline} - module, which is delivered with Qt 5.14, and later. For more - information about adding the module to an older Qt version, see + add-on module, which you can install with Qt 5.14, and later. For more + information about adding the module to an older Qt version, see \l{Adding Qt Quick Timeline Module to Qt Installations}. \endif @@ -77,9 +69,7 @@ \list 1 \li In the \uicontrol Navigator, select the item to animate. - \li Select the \uicontrol Timeline tab to open the \uicontrol Timeline - view. - \li Select the \inlineimage plus.png + \li In the \uicontrol Timeline view, select the \inlineimage plus.png (\uicontrol {Add Timeline (A)}) button, or press \key {A} to specify settings for the timeline and running the animation in the \uicontrol {Timeline Settings} dialog. @@ -144,7 +134,7 @@ \section1 Managing Keyframes To animate components in the \uicontrol Timeline view, move to a frame - on the timeline and specify changes in the values of a property. \QDS + on the timeline and specify changes in the values of a property. \QC automatically adds keyframes between two keyframes, and sets their values evenly to create an appearance of movement or transformation. @@ -160,7 +150,8 @@ \li Select the \uicontrol {To Start (Home)}, \uicontrol {Previous (,)}, or \uicontrol {Next (.)} buttons (3), or use the keyboard shortcuts to move to the first, previous, or next frame on the timeline. - \li Enter the number of a frame in the field (4) to move to that frame. + \li Enter the number of a frame in the current keyframe field (4) to + move to that frame. \li Select the \uicontrol Previous and \uicontrol Next buttons next to a property name on the timeline (5) to move to the previous or next keyframe for that property. @@ -231,13 +222,11 @@ You can view the animation on the canvas by moving the playhead along the timeline. - \if defined(qtdesignstudio) To preview the animation, select the \uicontrol {Play (Space)} button or press \key Space. To preview the whole UI, select the \inlineimage live_preview.png (\uicontrol {Show Live Preview}) button on the canvas toolbar or press \key {Alt+P}. - \endif \section1 Editing Easing Curves @@ -247,7 +236,7 @@ timeline are \e linear, which means that they move from the beginning to the end at a constant speed. You can use the \uicontrol {Easing Curve Editor} to edit the easing curve between two keyframes. You can also use the more - advanced \uicontrol {Curve Editor (C)} to edit the curves for the whole + advanced \uicontrol {Animation Curve Editor} to edit the curves for the whole animation. \section2 Attaching Easing Curves to Keyframes @@ -306,23 +295,24 @@ \section1 Editing Animation Curves - In the curve editor, you can view and modify the whole animation curve. You + In the animation curve editor, you can view and modify the whole animation + curve. You can insert keyframes to the curve and drag them and the point handlers to modify the curve. You can modify the appearance of the curve in the style editor. You can also edit easing curves that you added with the easing curve editor. - \image studio-curve-editor.png "Curve Editor" + \image studio-curve-editor.png "Animation Curve Editor" To edit animation curves: \list 1 \li In the \uicontrol Timeline view, insert at least one keyframe. \li Select \inlineimage curveGraphIcon.png - (\uicontrol {Curve Editor (C)} on the toolbar or press \key C - to open the curve editor. - \li Right-click in the curve editor, and select + (\uicontrol {Animation Curve Editor}) on the toolbar or press \key C + to open the animation curve editor. + \li Right-click in the animation curve editor, and select \uicontrol {Insert Keyframe} to add a keyframe. \li Select keyframes to display the easing curves attached to them. To select multiple keyframes, press and hold \key Ctrl. From 2e4ed0696ba3aba95d189c7de80853c8a1f53aca Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 22 Apr 2020 17:25:41 +0200 Subject: [PATCH 05/41] CompilationDbProjectManager: Do not canonicalize file paths In particular, we do not want to follow symbolic links, but see the file names as they appear in the project file. Fixes: QTCREATORBUG-23511 Change-Id: Ibf83ac143933fa0c9568dd4e3c0be825d8ba8f0b Reviewed-by: hjk Reviewed-by: Eike Ziller --- .../compilationdatabaseprojectmanager/compilationdbparser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp index 1505dffa1a7..7b498ab957d 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp @@ -170,7 +170,7 @@ static FilePath jsonObjectFilename(const QJsonObject &object) const QString workingDir = QDir::fromNativeSeparators(object["directory"].toString()); FilePath fileName = FilePath::fromString(QDir::fromNativeSeparators(object["file"].toString())); if (fileName.toFileInfo().isRelative()) - fileName = FilePath::fromString(workingDir + "/" + fileName.toString()).canonicalPath(); + fileName = FilePath::fromString(QDir::cleanPath(workingDir + "/" + fileName.toString())); return fileName; } From 43454c3fcd7ea1635411805eec239e3f4ad43b58 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Tue, 18 Feb 2020 12:19:44 +0100 Subject: [PATCH 06/41] Squish: Update expected tree for qbs Change-Id: I3ba303f0206db193d3e00ce52ac20f516823881c Reviewed-by: Robert Loehning Reviewed-by: Christian Stenger --- .../testdata/projecttree_creator.tsv | 9327 ++++++++--------- 1 file changed, 4650 insertions(+), 4677 deletions(-) diff --git a/tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv b/tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv index eee343829d2..fb41cd7373d 100644 --- a/tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv +++ b/tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv @@ -298,7 +298,7 @@ "doc.qbs:17" "2" "main qdocconf file" "2" "QtcDocumentation.qbs:13" "3" -"qtcreator.qdocconf" "4" +"qtcreator.qdocconf" "3" "src" "2" "analyze" "3" "cpu-usage-analyzer.qdoc" "4" @@ -466,7 +466,7 @@ "doc.qbs:7" "2" "main qdocconf file" "2" "QtcDocumentation.qbs:13" "3" -"qtcreator-online.qdocconf" "4" +"qtcreator-online.qdocconf" "3" "src" "2" "analyze" "3" "cpu-usage-analyzer.qdoc" "4" @@ -634,32 +634,31 @@ "qtcreator.qbs:26" "1" "Group 1" "1" "qtcreator.qbs:29" "2" -"qbs" "2" -"imports" "3" -"QtcFunctions" "4" -"functions.js" "5" -"QtcAutotest.qbs" "4" -"QtcCommercialPlugin.qbs" "4" -"QtcDevHeaders.qbs" "4" -"QtcDocumentation.qbs" "4" -"QtcLibrary.qbs" "4" -"QtcPlugin.qbs" "4" -"QtcProduct.qbs" "4" -"QtcTool.qbs" "4" -"src" "4" -"modules" "3" -"copyable_resource" "4" -"copyable-resource.qbs" "5" -"libclang" "4" -"functions.js" "5" -"libclang.qbs" "5" -"pluginjson" "4" -"pluginjson.qbs" "5" -"qbsbuildconfig" "4" -"qbsbuildconfig.qbs" "5" -"qtc" "4" -"qtc.js" "5" -"qtc.qbs" "5" +"imports" "2" +"QtcFunctions" "3" +"functions.js" "4" +"QtcAutotest.qbs" "3" +"QtcCommercialPlugin.qbs" "3" +"QtcDevHeaders.qbs" "3" +"QtcDocumentation.qbs" "3" +"QtcLibrary.qbs" "3" +"QtcPlugin.qbs" "3" +"QtcProduct.qbs" "3" +"QtcTool.qbs" "3" +"src" "3" +"modules" "2" +"copyable_resource" "3" +"copyable-resource.qbs" "4" +"libclang" "3" +"functions.js" "4" +"libclang.qbs" "4" +"pluginjson" "3" +"pluginjson.qbs" "4" +"qbsbuildconfig" "3" +"qbsbuildconfig.qbs" "4" +"qtc" "3" +"qtc.js" "4" +"qtc.qbs" "4" "qmake project files" "0" "qtcreator.qbs:38" "1" "bin" "1" @@ -1760,692 +1759,692 @@ "yacc.xml" "3" "Conditional" "1" "share.qbs:47" "2" -"lrelease.xml" "3" -"lupdate.xml" "3" -"qmlscene.xml" "3" -"qmlviewer.xml" "3" +"lrelease.xml" "2" +"lupdate.xml" "2" +"qmlscene.xml" "2" +"qmlviewer.xml" "2" "Unconditional" "1" "share.qbs:7" "2" -"qtcreator" "2" -"cplusplus" "3" -"examples" "4" -"clazy_example.cpp" "5" -"examples.pro" "5" -"tidy_example.cpp" "5" -"tidy_example.h" "5" -"qobjectdefs.h" "5" -"debugger" "3" -"boosttypes.py" "4" -"cdbbridge.py" "4" -"creatortypes.py" "4" -"dumper.py" "4" -"gdbbridge.py" "4" -"LICENSE.GPL3-EXCEPT" "4" -"lldbbridge.py" "4" -"misctypes.py" "4" -"opencvtypes.py" "4" -"pdbbridge.py" "4" -"personaltypes.py" "4" -"qttypes.py" "4" -"README.txt" "4" -"stdtypes.py" "4" -"glsl" "3" -"glsl_120.frag" "4" -"glsl_120.vert" "4" -"glsl_120_common.glsl" "4" -"glsl_es_100.frag" "4" -"glsl_es_100.vert" "4" -"glsl_es_100_common.glsl" "4" -"modeleditor" "3" -"standard.def" "4" -"qml-type-descriptions" "3" -"builtins.qmltypes" "4" -"qbs-base.qmltypes" "4" -"qmlproject-bundle.json" "4" -"qmlproject.qmltypes" "4" -"qmlruntime.qmltypes" "4" -"qmltypes-bundle.json" "4" -"qt-labs-folderlistmodel.qmltypes" "4" -"qt-labs-gestures.qmltypes" "4" -"qt-labs-particles.qmltypes" "4" -"qt5QtQuick2-bundle.json" "4" -"qtmobility-connectivity.qmltypes" "4" -"qtmobility-contacts.qmltypes" "4" -"qtmobility-feedback.qmltypes" "4" -"qtmobility-gallery.qmltypes" "4" -"qtmobility-location.qmltypes" "4" -"qtmobility-messaging.qmltypes" "4" -"qtmobility-organizer.qmltypes" "4" -"qtmobility-publishsubscribe.qmltypes" "4" -"qtmobility-sensors.qmltypes" "4" -"qtmobility-serviceframework.qmltypes" "4" -"qtmobility-systeminfo.qmltypes" "4" -"qtmultimediakit.qmltypes" "4" -"qtwebkit.qmltypes" "4" -"commands" "4" -"changeauxiliarycommand.cpp" "5" -"changeauxiliarycommand.h" "5" -"changebindingscommand.cpp" "5" -"changebindingscommand.h" "5" -"changefileurlcommand.cpp" "5" -"changefileurlcommand.h" "5" -"changeidscommand.cpp" "5" -"changeidscommand.h" "5" -"changenodesourcecommand.cpp" "5" -"changenodesourcecommand.h" "5" -"changestatecommand.cpp" "5" -"changestatecommand.h" "5" -"changevaluescommand.cpp" "5" -"changevaluescommand.h" "5" -"childrenchangedcommand.cpp" "5" -"childrenchangedcommand.h" "5" -"clearscenecommand.cpp" "5" -"clearscenecommand.h" "5" -"commands.pri" "5" -"completecomponentcommand.cpp" "5" -"completecomponentcommand.h" "5" -"componentcompletedcommand.cpp" "5" -"componentcompletedcommand.h" "5" -"createinstancescommand.cpp" "5" -"createinstancescommand.h" "5" -"createscenecommand.cpp" "5" -"createscenecommand.h" "5" -"debugoutputcommand.cpp" "5" -"debugoutputcommand.h" "5" -"endpuppetcommand.cpp" "5" -"endpuppetcommand.h" "5" -"informationchangedcommand.cpp" "5" -"informationchangedcommand.h" "5" -"pixmapchangedcommand.cpp" "5" -"pixmapchangedcommand.h" "5" -"puppetalivecommand.cpp" "5" -"puppetalivecommand.h" "5" -"removeinstancescommand.cpp" "5" -"removeinstancescommand.h" "5" -"removepropertiescommand.cpp" "5" -"removepropertiescommand.h" "5" -"removesharedmemorycommand.cpp" "5" -"removesharedmemorycommand.h" "5" -"reparentinstancescommand.cpp" "5" -"reparentinstancescommand.h" "5" -"statepreviewimagechangedcommand.cpp" "5" -"statepreviewimagechangedcommand.h" "5" -"synchronizecommand.cpp" "5" -"synchronizecommand.h" "5" -"tokencommand.cpp" "5" -"tokencommand.h" "5" -"valueschangedcommand.cpp" "5" -"valueschangedcommand.h" "5" -"container" "4" -"addimportcontainer.cpp" "5" -"addimportcontainer.h" "5" -"container.pri" "5" -"idcontainer.cpp" "5" -"idcontainer.h" "5" -"imagecontainer.cpp" "5" -"imagecontainer.h" "5" -"informationcontainer.cpp" "5" -"informationcontainer.h" "5" -"instancecontainer.cpp" "5" -"instancecontainer.h" "5" -"mockuptypecontainer.cpp" "5" -"mockuptypecontainer.h" "5" -"propertyabstractcontainer.cpp" "5" -"propertyabstractcontainer.h" "5" -"propertybindingcontainer.cpp" "5" -"propertybindingcontainer.h" "5" -"propertyvaluecontainer.cpp" "5" -"propertyvaluecontainer.h" "5" -"reparentcontainer.cpp" "5" -"reparentcontainer.h" "5" -"sharedmemory.h" "5" -"sharedmemory_qt.cpp" "5" -"sharedmemory_unix.cpp" "5" -"html" "4" -"welcome.html" "5" -"images" "4" -"template_image.png" "5" -"webkit.png" "5" +"cplusplus" "2" +"examples" "3" +"clazy_example.cpp" "4" +"examples.pro" "4" +"tidy_example.cpp" "4" +"tidy_example.h" "4" +"qobjectdefs.h" "4" +"debugger" "2" +"boosttypes.py" "3" +"cdbbridge.py" "3" +"creatortypes.py" "3" +"dumper.py" "3" +"gdbbridge.py" "3" +"LICENSE.GPL3-EXCEPT" "3" +"lldbbridge.py" "3" +"misctypes.py" "3" +"opencvtypes.py" "3" +"pdbbridge.py" "3" +"personaltypes.py" "3" +"qttypes.py" "3" +"README.txt" "3" +"stdtypes.py" "3" +"glsl" "2" +"glsl_120.frag" "3" +"glsl_120.vert" "3" +"glsl_120_common.glsl" "3" +"glsl_es_100.frag" "3" +"glsl_es_100.vert" "3" +"glsl_es_100_common.glsl" "3" +"modeleditor" "2" +"standard.def" "3" +"qml-type-descriptions" "2" +"builtins.qmltypes" "3" +"qbs-base.qmltypes" "3" +"qmlproject-bundle.json" "3" +"qmlproject.qmltypes" "3" +"qmlruntime.qmltypes" "3" +"qmltypes-bundle.json" "3" +"qt-labs-folderlistmodel.qmltypes" "3" +"qt-labs-gestures.qmltypes" "3" +"qt-labs-particles.qmltypes" "3" +"qt5QtQuick2-bundle.json" "3" +"qtmobility-connectivity.qmltypes" "3" +"qtmobility-contacts.qmltypes" "3" +"qtmobility-feedback.qmltypes" "3" +"qtmobility-gallery.qmltypes" "3" +"qtmobility-location.qmltypes" "3" +"qtmobility-messaging.qmltypes" "3" +"qtmobility-organizer.qmltypes" "3" +"qtmobility-publishsubscribe.qmltypes" "3" +"qtmobility-sensors.qmltypes" "3" +"qtmobility-serviceframework.qmltypes" "3" +"qtmobility-systeminfo.qmltypes" "3" +"qtmultimediakit.qmltypes" "3" +"qtwebkit.qmltypes" "3" +"commands" "3" +"changeauxiliarycommand.cpp" "4" +"changeauxiliarycommand.h" "4" +"changebindingscommand.cpp" "4" +"changebindingscommand.h" "4" +"changefileurlcommand.cpp" "4" +"changefileurlcommand.h" "4" +"changeidscommand.cpp" "4" +"changeidscommand.h" "4" +"changenodesourcecommand.cpp" "4" +"changenodesourcecommand.h" "4" +"changestatecommand.cpp" "4" +"changestatecommand.h" "4" +"changevaluescommand.cpp" "4" +"changevaluescommand.h" "4" +"childrenchangedcommand.cpp" "4" +"childrenchangedcommand.h" "4" +"clearscenecommand.cpp" "4" +"clearscenecommand.h" "4" +"commands.pri" "4" +"completecomponentcommand.cpp" "4" +"completecomponentcommand.h" "4" +"componentcompletedcommand.cpp" "4" +"componentcompletedcommand.h" "4" +"createinstancescommand.cpp" "4" +"createinstancescommand.h" "4" +"createscenecommand.cpp" "4" +"createscenecommand.h" "4" +"debugoutputcommand.cpp" "4" +"debugoutputcommand.h" "4" +"endpuppetcommand.cpp" "4" +"endpuppetcommand.h" "4" +"informationchangedcommand.cpp" "4" +"informationchangedcommand.h" "4" +"pixmapchangedcommand.cpp" "4" +"pixmapchangedcommand.h" "4" +"puppetalivecommand.cpp" "4" +"puppetalivecommand.h" "4" +"removeinstancescommand.cpp" "4" +"removeinstancescommand.h" "4" +"removepropertiescommand.cpp" "4" +"removepropertiescommand.h" "4" +"removesharedmemorycommand.cpp" "4" +"removesharedmemorycommand.h" "4" +"reparentinstancescommand.cpp" "4" +"reparentinstancescommand.h" "4" +"statepreviewimagechangedcommand.cpp" "4" +"statepreviewimagechangedcommand.h" "4" +"synchronizecommand.cpp" "4" +"synchronizecommand.h" "4" +"tokencommand.cpp" "4" +"tokencommand.h" "4" +"valueschangedcommand.cpp" "4" +"valueschangedcommand.h" "4" +"container" "3" +"addimportcontainer.cpp" "4" +"addimportcontainer.h" "4" +"container.pri" "4" +"idcontainer.cpp" "4" +"idcontainer.h" "4" +"imagecontainer.cpp" "4" +"imagecontainer.h" "4" +"informationcontainer.cpp" "4" +"informationcontainer.h" "4" +"instancecontainer.cpp" "4" +"instancecontainer.h" "4" +"mockuptypecontainer.cpp" "4" +"mockuptypecontainer.h" "4" +"propertyabstractcontainer.cpp" "4" +"propertyabstractcontainer.h" "4" +"propertybindingcontainer.cpp" "4" +"propertybindingcontainer.h" "4" +"propertyvaluecontainer.cpp" "4" +"propertyvaluecontainer.h" "4" +"reparentcontainer.cpp" "4" +"reparentcontainer.h" "4" +"sharedmemory.h" "4" +"sharedmemory_qt.cpp" "4" +"sharedmemory_unix.cpp" "4" +"html" "3" +"welcome.html" "4" +"images" "3" +"template_image.png" "4" +"webkit.png" "4" +"instances" "3" +"instances.pri" "4" +"nodeinstanceclientproxy.cpp" "4" +"nodeinstanceclientproxy.h" "4" +"interfaces" "3" +"commondefines.h" "4" +"interfaces.pri" "4" +"nodeinstanceclientinterface.h" "4" +"nodeinstanceglobal.h" "4" +"nodeinstanceserverinterface.cpp" "4" +"nodeinstanceserverinterface.h" "4" +"mockfiles" "3" +"GenericBackend.qml" "4" +"SwipeView.qml" "4" +"Window.qml" "4" +"qml2puppet" "3" "instances" "4" +"anchorchangesnodeinstance.cpp" "5" +"anchorchangesnodeinstance.h" "5" +"behaviornodeinstance.cpp" "5" +"behaviornodeinstance.h" "5" +"childrenchangeeventfilter.cpp" "5" +"childrenchangeeventfilter.h" "5" +"componentnodeinstance.cpp" "5" +"componentnodeinstance.h" "5" +"dummycontextobject.cpp" "5" +"dummycontextobject.h" "5" +"dummynodeinstance.cpp" "5" +"dummynodeinstance.h" "5" "instances.pri" "5" -"nodeinstanceclientproxy.cpp" "5" -"nodeinstanceclientproxy.h" "5" -"interfaces" "4" -"commondefines.h" "5" -"interfaces.pri" "5" -"nodeinstanceclientinterface.h" "5" -"nodeinstanceglobal.h" "5" -"nodeinstanceserverinterface.cpp" "5" -"nodeinstanceserverinterface.h" "5" -"mockfiles" "4" -"GenericBackend.qml" "5" -"SwipeView.qml" "5" -"Window.qml" "5" -"qml2puppet" "4" -"instances" "5" -"anchorchangesnodeinstance.cpp" "6" -"anchorchangesnodeinstance.h" "6" -"behaviornodeinstance.cpp" "6" -"behaviornodeinstance.h" "6" -"childrenchangeeventfilter.cpp" "6" -"childrenchangeeventfilter.h" "6" -"componentnodeinstance.cpp" "6" -"componentnodeinstance.h" "6" -"dummycontextobject.cpp" "6" -"dummycontextobject.h" "6" -"dummynodeinstance.cpp" "6" -"dummynodeinstance.h" "6" -"instances.pri" "6" -"layoutnodeinstance.cpp" "6" -"layoutnodeinstance.h" "6" -"nodeinstanceserver.cpp" "6" -"nodeinstanceserver.h" "6" -"nodeinstancesignalspy.cpp" "6" -"nodeinstancesignalspy.h" "6" -"objectnodeinstance.cpp" "6" -"objectnodeinstance.h" "6" -"positionernodeinstance.cpp" "6" -"positionernodeinstance.h" "6" -"qmlpropertychangesnodeinstance.cpp" "6" -"qmlpropertychangesnodeinstance.h" "6" -"qmlstatenodeinstance.cpp" "6" -"qmlstatenodeinstance.h" "6" -"qmltransitionnodeinstance.cpp" "6" -"qmltransitionnodeinstance.h" "6" -"qt5informationnodeinstanceserver.cpp" "6" -"qt5informationnodeinstanceserver.h" "6" -"qt5nodeinstanceclientproxy.cpp" "6" -"qt5nodeinstanceclientproxy.h" "6" -"qt5nodeinstanceserver.cpp" "6" -"qt5nodeinstanceserver.h" "6" -"qt5previewnodeinstanceserver.cpp" "6" -"qt5previewnodeinstanceserver.h" "6" -"qt5rendernodeinstanceserver.cpp" "6" -"qt5rendernodeinstanceserver.h" "6" -"qt5testnodeinstanceserver.cpp" "6" -"qt5testnodeinstanceserver.h" "6" -"quickitemnodeinstance.cpp" "6" -"quickitemnodeinstance.h" "6" -"servernodeinstance.cpp" "6" -"servernodeinstance.h" "6" -"Info.plist" "5" -"qml2puppet.pri" "5" -"qml2puppet.pro" "5" -"qml2puppetmain.cpp" "5" -"qmlprivategate" "4" -"designercustomobjectdata.cpp" "5" -"designercustomobjectdata.h" "5" -"designersupportdelegate.h" "5" -"metaobject.cpp" "5" -"metaobject.h" "5" -"qmlprivategate.cpp" "5" -"qmlprivategate.h" "5" -"qmlprivategate.pri" "5" -"qmlprivategate_56.cpp" "5" -"types" "4" -"enumeration.cpp" "5" -"enumeration.h" "5" -"types.pri" "5" -"qmlpuppet.qrc" "4" -"qmlpuppet_utilities.pri" "4" -"qmldesigner" "3" -"common" "4" -"DesignerScrollViewStyle.qml" "5" -"itemLibraryQmlSources" "4" -"ItemDelegate.qml" "5" -"ItemsView.qml" "5" -"propertyEditorQmlSources" "4" -"images" "6" -"checkers.png" "7" -"down-arrow.png" "7" -"down-arrow@2x.png" "7" -"expression.png" "7" -"expression@2x.png" "7" -"icon_color_gradient.png" "7" -"icon_color_none.png" "7" -"icon_color_solid.png" "7" -"placeholder.png" "7" -"placeholder@2x.png" "7" -"submenu.png" "7" -"submenu@2x.png" "7" -"up-arrow.png" "7" -"up-arrow@2x.png" "7" -"AligmentHorizontalButtons.qml" "6" -"AligmentVerticalButtons.qml" "6" -"AnchorButtons.qml" "6" -"BoolButtonRowButton.qml" "6" -"Button.qml" "6" -"ButtonRow.qml" "6" -"ButtonRow2.qml" "6" -"ButtonRowButton.qml" "6" -"CheckBox.qml" "6" -"ColorButton.qml" "6" -"ColorCheckButton.qml" "6" -"ColorEditor.qml" "6" -"ColorLogic.qml" "6" -"ComboBox.qml" "6" -"Constants.js" "6" -"CustomCheckBoxStyle.qml" "6" -"CustomComboBoxStyle.qml" "6" -"CustomSpinBoxStyle.qml" "6" -"DoubleSpinBox.qml" "6" -"ExpandingSpacer.qml" "6" -"ExpressionTextField.qml" "6" -"ExtendedFunctionButton.qml" "6" -"FlickableSection.qml" "6" -"FontComboBox.qml" "6" -"FontSection.qml" "6" -"FontStyleButtons.qml" "6" -"GradientLine.qml" "6" -"GroupBox.qml" "6" -"HueSlider.qml" "6" -"IconLabel.qml" "6" -"Label.qml" "6" -"LineEdit.qml" "6" -"MarginSection.qml" "6" -"OriginControl.qml" "6" -"PaddingSection.qml" "6" -"qmldir" "6" -"RoundedPanel.qml" "6" -"ScrollView.qml" "6" -"SecondColumnLayout.qml" "6" -"Section.qml" "6" -"SectionLayout.qml" "6" -"SpinBox.qml" "6" -"StandardTextSection.qml" "6" -"Tab.qml" "6" -"TabView.qml" "6" -"ToolTipArea.qml" "6" -"UrlChooser.qml" "6" -"PropertyTemplates" "5" -"BooleanEditorTemplate.template" "6" -"ColorEditorTemplate.template" "6" -"IntEditorTemplate.template" "6" -"RealEditorTemplate.template" "6" -"StringEditorTemplate.template" "6" -"TemplateTypes.qml" "6" -"UrlEditorTemplate.template" "6" -"QtQuick" "5" -"Controls" "6" -"DialogSpecifics.qml" "7" -"DrawerSpecifics.qml" "7" -"PopupSection.qml" "7" -"PopupSpecifics.qml" "7" -"Layouts" "6" -"GridLayoutSpecifics.qml" "7" -"Window" "6" -"WindowSpecifics.qml" "7" -"AdvancedSection.qml" "6" -"AnchorRow.qml" "6" -"BorderImageSpecifics.qml" "6" -"ColumnSpecifics.qml" "6" -"emptyPane.qml" "6" -"FlickableSpecifics.qml" "6" -"FlipableSpecifics.qml" "6" -"FlowSpecifics.qml" "6" -"GeometrySection.qml" "6" -"GridSpecifics.qml" "6" -"GridViewSpecifics.qml" "6" -"ImageSpecifics.qml" "6" -"ItemPane.qml" "6" -"LayoutPoperties.qml" "6" -"LayoutSection.qml" "6" -"ListViewSpecifics.qml" "6" -"MouseAreaSpecifics.qml" "6" -"PathViewSpecifics.qml" "6" -"project.qmlproject" "6" -"QtObjectPane.qml" "6" -"RectangleSpecifics.qml" "6" -"RowSpecifics.qml" "6" -"TargetComboBox.qml" "6" -"TextEditSpecifics.qml" "6" -"TextInputSection.qml" "6" -"TextInputSpecifics.qml" "6" -"TextSpecifics.qml" "6" -"statesEditorQmlSources" "4" -"DesignerTextFieldStyle.qml" "5" -"StatesDelegate.qml" "5" -"StatesList.qml" "5" -"qmlicons" "3" -"BorderImage.png" "5" -"BusyIndicator.png" "5" -"Button.png" "5" -"ButtonColumn.png" "5" -"ButtonRow.png" "5" -"CheckBox.png" "5" -"ChoiceList.png" "5" -"ColorAnimation.png" "5" -"Component.png" "5" -"CountBubble.png" "5" -"DatePickerDialog.png" "5" -"Flickable.png" "5" -"Flipable.png" "5" -"FocusScope.png" "5" -"GridView.png" "5" -"Image.png" "5" -"InfoBanner.png" "5" -"item-icon16.png" "5" -"Item.png" "5" -"ListButton.png" "5" -"ListDelegate.png" "5" -"ListView.png" "5" -"MoreIndicator.png" "5" -"MouseArea.png" "5" -"PageIndicator.png" "5" -"ParallelAnimation.png" "5" -"PathView.png" "5" -"PauseAnimation.png" "5" -"ProgressBar.png" "5" -"PropertyChanges.png" "5" -"RadioButton.png" "5" -"RatingIndicator.png" "5" -"Rectangle.png" "5" -"SequentialAnimation.png" "5" -"Slider.png" "5" -"State.png" "5" -"Switch.png" "5" -"TabBar.png" "5" -"TabButton.png" "5" -"Text.png" "5" -"TextArea.png" "5" -"TextEdit.png" "5" -"TextField.png" "5" -"TextInput.png" "5" -"TimePickerDialog.png" "5" -"ToolBar.png" "5" -"Transition.png" "5" -"Tumbler.png" "5" -"TumblerButton.png" "5" -"TumblerColumn.png" "5" -"TumblerDialog.png" "5" -"Window.png" "5" -"WebView.png" "5" -"schemes" "3" -"MS_Visual_C++.kms" "4" -"Xcode.kms" "4" -"snippets" "3" -"cpp.xml" "4" -"qml.xml" "4" -"text.xml" "4" -"styles" "3" -"creator-dark.xml" "4" -"dark.xml" "4" -"default.xml" "4" -"default_classic.xml" "4" -"grayscale.xml" "4" -"inkpot.xml" "4" -"intellij.xml" "4" -"modnokai_night_shift_v2.xml" "4" -"solarized-dark.xml" "4" -"solarized-light.xml" "4" -"templates" "3" -"qt4project" "4" -"customwidgetwizard" "5" -"tpl_collection.cpp" "6" -"tpl_collection.h" "6" -"tpl_plugin.pro" "6" -"tpl_resources.qrc" "6" -"tpl_single.cpp" "6" -"tpl_single.h" "6" -"tpl_widget.cpp" "6" -"tpl_widget.h" "6" -"tpl_widget_include.pri" "6" -"tpl_widget_lib.pro" "6" -"main.cpp" "5" -"mywidget.cpp" "5" -"mywidget.h" "5" -"mywidget_form.cpp" "5" -"mywidget_form.h" "5" -"widget.ui" "5" -"wizards" "4" -"autotest" "5" -"files" "6" -"googlecommon.js" "7" -"gtest_dependency.pri" "7" -"tst.pro" "7" -"tst.qbs" "7" -"tst.txt" "7" -"tst_main.cpp" "7" -"tst_qml.tmpl" "7" -"tst_src.cpp" "7" -"tst_src.h" "7" -"autotest.png" "6" -"autotest@2x.png" "6" -"wizard.json" "6" -"classes" "5" -"cpp" "6" -"file.cpp" "7" -"file.h" "7" -"wizard.json" "7" -"itemmodel" "6" -"itemmodel.cpp" "7" -"itemmodel.h" "7" -"listmodel.cpp" "7" -"listmodel.h" "7" -"tablemodel.cpp" "7" -"tablemodel.h" "7" -"wizard.json" "7" -"python" "6" -"file.py" "7" -"wizard.json" "7" -"qtquickui" "6" -"file.qml.tpl" "7" -"fileForm.ui.qml.tpl" "7" -"wizard.json" "7" -"codesnippet" "5" -"main.cpp" "6" -"project.pro" "6" -"wizard.xml" "6" +"layoutnodeinstance.cpp" "5" +"layoutnodeinstance.h" "5" +"nodeinstanceserver.cpp" "5" +"nodeinstanceserver.h" "5" +"nodeinstancesignalspy.cpp" "5" +"nodeinstancesignalspy.h" "5" +"objectnodeinstance.cpp" "5" +"objectnodeinstance.h" "5" +"positionernodeinstance.cpp" "5" +"positionernodeinstance.h" "5" +"qmlpropertychangesnodeinstance.cpp" "5" +"qmlpropertychangesnodeinstance.h" "5" +"qmlstatenodeinstance.cpp" "5" +"qmlstatenodeinstance.h" "5" +"qmltransitionnodeinstance.cpp" "5" +"qmltransitionnodeinstance.h" "5" +"qt5informationnodeinstanceserver.cpp" "5" +"qt5informationnodeinstanceserver.h" "5" +"qt5nodeinstanceclientproxy.cpp" "5" +"qt5nodeinstanceclientproxy.h" "5" +"qt5nodeinstanceserver.cpp" "5" +"qt5nodeinstanceserver.h" "5" +"qt5previewnodeinstanceserver.cpp" "5" +"qt5previewnodeinstanceserver.h" "5" +"qt5rendernodeinstanceserver.cpp" "5" +"qt5rendernodeinstanceserver.h" "5" +"qt5testnodeinstanceserver.cpp" "5" +"qt5testnodeinstanceserver.h" "5" +"quickitemnodeinstance.cpp" "5" +"quickitemnodeinstance.h" "5" +"servernodeinstance.cpp" "5" +"servernodeinstance.h" "5" +"Info.plist" "4" +"qml2puppet.pri" "4" +"qml2puppet.pro" "4" +"qml2puppetmain.cpp" "4" +"qmlprivategate" "3" +"designercustomobjectdata.cpp" "4" +"designercustomobjectdata.h" "4" +"designersupportdelegate.h" "4" +"metaobject.cpp" "4" +"metaobject.h" "4" +"qmlprivategate.cpp" "4" +"qmlprivategate.h" "4" +"qmlprivategate.pri" "4" +"qmlprivategate_56.cpp" "4" +"types" "3" +"enumeration.cpp" "4" +"enumeration.h" "4" +"types.pri" "4" +"qmlpuppet.qrc" "3" +"qmlpuppet_utilities.pri" "3" +"qmldesigner" "2" +"common" "3" +"DesignerScrollViewStyle.qml" "4" +"itemLibraryQmlSources" "3" +"ItemDelegate.qml" "4" +"ItemsView.qml" "4" +"propertyEditorQmlSources" "3" +"images" "5" +"checkers.png" "6" +"down-arrow.png" "6" +"down-arrow@2x.png" "6" +"expression.png" "6" +"expression@2x.png" "6" +"icon_color_gradient.png" "6" +"icon_color_none.png" "6" +"icon_color_solid.png" "6" +"placeholder.png" "6" +"placeholder@2x.png" "6" +"submenu.png" "6" +"submenu@2x.png" "6" +"up-arrow.png" "6" +"up-arrow@2x.png" "6" +"AligmentHorizontalButtons.qml" "5" +"AligmentVerticalButtons.qml" "5" +"AnchorButtons.qml" "5" +"BoolButtonRowButton.qml" "5" +"Button.qml" "5" +"ButtonRow.qml" "5" +"ButtonRow2.qml" "5" +"ButtonRowButton.qml" "5" +"CheckBox.qml" "5" +"ColorButton.qml" "5" +"ColorCheckButton.qml" "5" +"ColorEditor.qml" "5" +"ColorLogic.qml" "5" +"ComboBox.qml" "5" +"Constants.js" "5" +"CustomCheckBoxStyle.qml" "5" +"CustomComboBoxStyle.qml" "5" +"CustomSpinBoxStyle.qml" "5" +"DoubleSpinBox.qml" "5" +"ExpandingSpacer.qml" "5" +"ExpressionTextField.qml" "5" +"ExtendedFunctionButton.qml" "5" +"FlickableSection.qml" "5" +"FontComboBox.qml" "5" +"FontSection.qml" "5" +"FontStyleButtons.qml" "5" +"GradientLine.qml" "5" +"GroupBox.qml" "5" +"HueSlider.qml" "5" +"IconLabel.qml" "5" +"Label.qml" "5" +"LineEdit.qml" "5" +"MarginSection.qml" "5" +"OriginControl.qml" "5" +"PaddingSection.qml" "5" +"qmldir" "5" +"RoundedPanel.qml" "5" +"ScrollView.qml" "5" +"SecondColumnLayout.qml" "5" +"Section.qml" "5" +"SectionLayout.qml" "5" +"SpinBox.qml" "5" +"StandardTextSection.qml" "5" +"Tab.qml" "5" +"TabView.qml" "5" +"ToolTipArea.qml" "5" +"UrlChooser.qml" "5" +"PropertyTemplates" "4" +"BooleanEditorTemplate.template" "5" +"ColorEditorTemplate.template" "5" +"IntEditorTemplate.template" "5" +"RealEditorTemplate.template" "5" +"StringEditorTemplate.template" "5" +"TemplateTypes.qml" "5" +"UrlEditorTemplate.template" "5" +"QtQuick" "4" +"Controls" "5" +"DialogSpecifics.qml" "6" +"DrawerSpecifics.qml" "6" +"PopupSection.qml" "6" +"PopupSpecifics.qml" "6" +"Layouts" "5" +"GridLayoutSpecifics.qml" "6" +"Window" "5" +"WindowSpecifics.qml" "6" +"AdvancedSection.qml" "5" +"AnchorRow.qml" "5" +"BorderImageSpecifics.qml" "5" +"ColumnSpecifics.qml" "5" +"emptyPane.qml" "5" +"FlickableSpecifics.qml" "5" +"FlipableSpecifics.qml" "5" +"FlowSpecifics.qml" "5" +"GeometrySection.qml" "5" +"GridSpecifics.qml" "5" +"GridViewSpecifics.qml" "5" +"ImageSpecifics.qml" "5" +"ItemPane.qml" "5" +"LayoutPoperties.qml" "5" +"LayoutSection.qml" "5" +"ListViewSpecifics.qml" "5" +"MouseAreaSpecifics.qml" "5" +"PathViewSpecifics.qml" "5" +"project.qmlproject" "5" +"QtObjectPane.qml" "5" +"RectangleSpecifics.qml" "5" +"RowSpecifics.qml" "5" +"TargetComboBox.qml" "5" +"TextEditSpecifics.qml" "5" +"TextInputSection.qml" "5" +"TextInputSpecifics.qml" "5" +"TextSpecifics.qml" "5" +"statesEditorQmlSources" "3" +"DesignerTextFieldStyle.qml" "4" +"StatesDelegate.qml" "4" +"StatesList.qml" "4" +"qmlicons" "2" +"BorderImage.png" "4" +"BusyIndicator.png" "4" +"Button.png" "4" +"ButtonColumn.png" "4" +"ButtonRow.png" "4" +"CheckBox.png" "4" +"ChoiceList.png" "4" +"ColorAnimation.png" "4" +"Component.png" "4" +"CountBubble.png" "4" +"DatePickerDialog.png" "4" +"Flickable.png" "4" +"Flipable.png" "4" +"FocusScope.png" "4" +"GridView.png" "4" +"Image.png" "4" +"InfoBanner.png" "4" +"item-icon16.png" "4" +"Item.png" "4" +"ListButton.png" "4" +"ListDelegate.png" "4" +"ListView.png" "4" +"MoreIndicator.png" "4" +"MouseArea.png" "4" +"PageIndicator.png" "4" +"ParallelAnimation.png" "4" +"PathView.png" "4" +"PauseAnimation.png" "4" +"ProgressBar.png" "4" +"PropertyChanges.png" "4" +"RadioButton.png" "4" +"RatingIndicator.png" "4" +"Rectangle.png" "4" +"SequentialAnimation.png" "4" +"Slider.png" "4" +"State.png" "4" +"Switch.png" "4" +"TabBar.png" "4" +"TabButton.png" "4" +"Text.png" "4" +"TextArea.png" "4" +"TextEdit.png" "4" +"TextField.png" "4" +"TextInput.png" "4" +"TimePickerDialog.png" "4" +"ToolBar.png" "4" +"Transition.png" "4" +"Tumbler.png" "4" +"TumblerButton.png" "4" +"TumblerColumn.png" "4" +"TumblerDialog.png" "4" +"Window.png" "4" +"WebView.png" "4" +"schemes" "2" +"MS_Visual_C++.kms" "3" +"Xcode.kms" "3" +"snippets" "2" +"cpp.xml" "3" +"qml.xml" "3" +"text.xml" "3" +"styles" "2" +"creator-dark.xml" "3" +"dark.xml" "3" +"default.xml" "3" +"default_classic.xml" "3" +"grayscale.xml" "3" +"inkpot.xml" "3" +"intellij.xml" "3" +"modnokai_night_shift_v2.xml" "3" +"solarized-dark.xml" "3" +"solarized-light.xml" "3" +"templates" "2" +"qt4project" "3" +"customwidgetwizard" "4" +"tpl_collection.cpp" "5" +"tpl_collection.h" "5" +"tpl_plugin.pro" "5" +"tpl_resources.qrc" "5" +"tpl_single.cpp" "5" +"tpl_single.h" "5" +"tpl_widget.cpp" "5" +"tpl_widget.h" "5" +"tpl_widget_include.pri" "5" +"tpl_widget_lib.pro" "5" +"main.cpp" "4" +"mywidget.cpp" "4" +"mywidget.h" "4" +"mywidget_form.cpp" "4" +"mywidget_form.h" "4" +"widget.ui" "4" +"wizards" "3" +"autotest" "4" "files" "5" -"cppheader" "6" -"file.h" "7" -"wizard.json" "7" -"cppsource" "6" -"file.cpp" "7" -"wizard.json" "7" -"form" "6" -"file.ui" "7" -"wizard.json" "7" -"glsl" "6" -"gl" "7" -"fragment" "8" -"file.frag" "9" -"wizard.json" "9" -"vertex" "8" -"file.vert" "9" -"wizard.json" "9" -"gles" "7" -"fragment" "8" -"file.fsh" "9" -"wizard.json" "9" -"vertex" "8" -"file.vsh" "9" -"wizard.json" "9" -"java" "6" -"source.java" "7" -"wizard.json" "7" -"js" "6" -"file.js" "7" -"wizard.json" "7" -"modeling" "6" -"model" "7" -"file.qmodel" "8" +"googlecommon.js" "6" +"gtest_dependency.pri" "6" +"tst.pro" "6" +"tst.qbs" "6" +"tst.txt" "6" +"tst_main.cpp" "6" +"tst_qml.tmpl" "6" +"tst_src.cpp" "6" +"tst_src.h" "6" +"autotest.png" "5" +"autotest@2x.png" "5" +"wizard.json" "5" +"classes" "4" +"cpp" "5" +"file.cpp" "6" +"file.h" "6" +"wizard.json" "6" +"itemmodel" "5" +"itemmodel.cpp" "6" +"itemmodel.h" "6" +"listmodel.cpp" "6" +"listmodel.h" "6" +"tablemodel.cpp" "6" +"tablemodel.h" "6" +"wizard.json" "6" +"python" "5" +"file.py" "6" +"wizard.json" "6" +"qtquickui" "5" +"file.qml.tpl" "6" +"fileForm.ui.qml.tpl" "6" +"wizard.json" "6" +"codesnippet" "4" +"main.cpp" "5" +"project.pro" "5" +"wizard.xml" "5" +"files" "4" +"cppheader" "5" +"file.h" "6" +"wizard.json" "6" +"cppsource" "5" +"file.cpp" "6" +"wizard.json" "6" +"form" "5" +"file.ui" "6" +"wizard.json" "6" +"glsl" "5" +"gl" "6" +"fragment" "7" +"file.frag" "8" "wizard.json" "8" -"scratch" "7" -"file.qmodel" "8" +"vertex" "7" +"file.vert" "8" "wizard.json" "8" -"nim" "6" -"file.nim" "7" -"wizard.json" "7" -"nimscript" "6" -"file.nims" "7" -"wizard.json" "7" -"python" "6" -"file.py" "7" -"wizard.json" "7" -"qrc" "6" -"file.qrc" "7" -"wizard.json" "7" -"qtquick2" "6" -"file.qml.tpl" "7" +"gles" "6" +"fragment" "7" +"file.fsh" "8" +"wizard.json" "8" +"vertex" "7" +"file.vsh" "8" +"wizard.json" "8" +"java" "5" +"source.java" "6" +"wizard.json" "6" +"js" "5" +"file.js" "6" +"wizard.json" "6" +"modeling" "5" +"model" "6" +"file.qmodel" "7" "wizard.json" "7" "scratch" "6" -"file.txt" "7" +"file.qmodel" "7" "wizard.json" "7" -"scxml" "6" -"file.scxml" "7" -"wizard.json" "7" -"text" "6" -"file.txt" "7" -"wizard.json" "7" -"global" "5" -"consoleapplication.png" "6" -"consoleapplication@2x.png" "6" -"guiapplication.png" "6" -"guiapplication@2x.png" "6" -"projects" "5" -"consoleapp" "6" -"CMakeLists.txt" "7" -"file.pro" "7" -"file.qbs" "7" -"main.cpp" "7" -"wizard.json" "7" -"nim" "6" -"file.nimproject" "7" +"nim" "5" +"file.nim" "6" +"wizard.json" "6" +"nimscript" "5" +"file.nims" "6" +"wizard.json" "6" +"python" "5" +"file.py" "6" +"wizard.json" "6" +"qrc" "5" +"file.qrc" "6" +"wizard.json" "6" +"qtquick2" "5" +"file.qml.tpl" "6" +"wizard.json" "6" +"scratch" "5" +"file.txt" "6" +"wizard.json" "6" +"scxml" "5" +"file.scxml" "6" +"wizard.json" "6" +"text" "5" +"file.txt" "6" +"wizard.json" "6" +"global" "4" +"consoleapplication.png" "5" +"consoleapplication@2x.png" "5" +"guiapplication.png" "5" +"guiapplication@2x.png" "5" +"projects" "4" +"consoleapp" "5" +"CMakeLists.txt" "6" +"file.pro" "6" +"file.qbs" "6" +"main.cpp" "6" +"wizard.json" "6" +"nim" "5" +"file.nimproject" "6" +"icon.png" "6" +"icon@2x.png" "6" +"main.nim" "6" +"wizard.json" "6" +"plainc" "5" +"CMakeLists.txt" "6" +"file.pro" "6" +"file.qbs" "6" +"main.c" "6" +"wizard.json" "6" +"plaincpp" "5" +"CMakeLists.txt" "6" +"file.pro" "6" +"file.qbs" "6" +"main.cpp" "6" +"wizard.json" "6" +"qmake/empty" "5" +"file.pro" "6" +"wizard.json" "6" +"qtquickapplication" "5" +"canvas3d" "6" +"plaincanvas3d" "7" +"glcode.js" "8" +"threejs" "7" +"3rdparty" "8" +"three.js" "9" +"glcode.js" "8" "icon.png" "7" "icon@2x.png" "7" -"main.nim" "7" +"main.qml.tpl" "7" +"qml.qrc" "7" "wizard.json" "7" -"plainc" "6" -"CMakeLists.txt" "7" -"file.pro" "7" -"file.qbs" "7" -"main.c" "7" +"empty" "6" +"icon.png" "7" +"icon@2x.png" "7" +"main.qml.tpl" "7" +"qml.qrc" "7" "wizard.json" "7" -"plaincpp" "6" -"CMakeLists.txt" "7" -"file.pro" "7" -"file.qbs" "7" -"main.cpp" "7" +"scroll" "6" +"icon.png" "7" +"icon@2x.png" "7" +"main.qml.tpl" "7" +"qml.qrc" "7" "wizard.json" "7" -"file.pro" "7" +"stack" "6" +"HomeForm.ui.qml.tpl" "7" +"icon.png" "7" +"icon@2x.png" "7" +"main.qml.tpl" "7" +"Page1Form.ui.qml.tpl" "7" +"Page2Form.ui.qml.tpl" "7" +"qml.qrc" "7" "wizard.json" "7" -"qtquickapplication" "6" -"canvas3d" "7" -"plaincanvas3d" "8" -"glcode.js" "9" -"threejs" "8" -"3rdparty" "9" -"three.js" "10" -"glcode.js" "9" -"icon.png" "8" -"icon@2x.png" "8" -"main.qml.tpl" "8" -"qml.qrc" "8" -"wizard.json" "8" -"empty" "7" -"icon.png" "8" -"icon@2x.png" "8" -"main.qml.tpl" "8" -"qml.qrc" "8" -"wizard.json" "8" -"scroll" "7" -"icon.png" "8" -"icon@2x.png" "8" -"main.qml.tpl" "8" -"qml.qrc" "8" -"wizard.json" "8" -"stack" "7" -"HomeForm.ui.qml.tpl" "8" -"icon.png" "8" -"icon@2x.png" "8" -"main.qml.tpl" "8" -"Page1Form.ui.qml.tpl" "8" -"Page2Form.ui.qml.tpl" "8" -"qml.qrc" "8" -"wizard.json" "8" -"swipe" "7" -"icon.png" "8" -"icon@2x.png" "8" -"main.qml.tpl" "8" -"Page1Form.ui.qml.tpl" "8" -"Page2Form.ui.qml.tpl" "8" -"qml.qrc" "8" -"wizard.json" "8" -"app.pro" "7" -"app.qbs" "7" -"CMakeLists.txt" "7" -"file.qbs" "7" -"main.cpp" "7" -"qtquickcontrols2.conf" "7" -"qtquickuiprototype" "6" -"app.qmlproject" "7" -"qtquickuiprototype.png" "7" -"qtquickuiprototype@2x.png" "7" +"swipe" "6" +"icon.png" "7" +"icon@2x.png" "7" +"main.qml.tpl" "7" +"Page1Form.ui.qml.tpl" "7" +"Page2Form.ui.qml.tpl" "7" +"qml.qrc" "7" "wizard.json" "7" -"vcs" "6" -"bazaar" "7" -"icon.png" "8" -"icon@2x.png" "8" -"wizard.json" "8" -"cvs" "7" -"icon.png" "8" -"icon@2x.png" "8" -"wizard.json" "8" -"git" "7" -"icon.png" "8" -"icon@2x.png" "8" -"wizard.json" "8" -"mercurial" "7" -"icon.png" "8" -"icon@2x.png" "8" -"wizard.json" "8" -"subversion" "7" -"icon.png" "8" -"icon@2x.png" "8" -"wizard.json" "8" -"git.ignore" "6" -"qtcreatorplugin" "5" -"myplugin.cpp" "6" -"myplugin.h" "6" -"MyPlugin.json.in" "6" -"myplugin.pro" "6" -"myplugin_global.h" "6" -"mypluginconstants.h" "6" -"qtcreatorplugin.png" "6" -"qtcreatorplugin@2x.png" "6" -"wizard.xml" "6" -"qtquick2-extension" "5" -"lib.png" "6" -"lib@2x.png" "6" -"object.cpp" "6" -"object.h" "6" -"plugin.cpp" "6" -"plugin.h" "6" -"project.pro" "6" -"qmldir" "6" -"wizard.xml" "6" -"qtquickstyleicons" "5" -"default.png" "6" -"default@2x.png" "6" -"material-dark.png" "6" -"material-dark@2x.png" "6" -"material-light.png" "6" -"material-light@2x.png" "6" -"universal-dark.png" "6" -"universal-dark@2x.png" "6" -"universal-light.png" "6" -"universal-light@2x.png" "6" -"README.txt" "5" -"themes" "3" -"dark.creatortheme" "4" -"default.creatortheme" "4" -"flat-dark.creatortheme" "4" -"flat-light.creatortheme" "4" -"flat.creatortheme" "4" -"welcomescreen" "3" -"welcomescreen.qml" "4" -"welcomescreen.qmlproject" "4" +"app.pro" "6" +"app.qbs" "6" +"CMakeLists.txt" "6" +"file.qbs" "6" +"main.cpp" "6" +"qtquickcontrols2.conf" "6" +"qtquickuiprototype" "5" +"app.qmlproject" "6" +"qtquickuiprototype.png" "6" +"qtquickuiprototype@2x.png" "6" +"wizard.json" "6" +"vcs" "5" +"bazaar" "6" +"icon.png" "7" +"icon@2x.png" "7" +"wizard.json" "7" +"cvs" "6" +"icon.png" "7" +"icon@2x.png" "7" +"wizard.json" "7" +"git" "6" +"icon.png" "7" +"icon@2x.png" "7" +"wizard.json" "7" +"mercurial" "6" +"icon.png" "7" +"icon@2x.png" "7" +"wizard.json" "7" +"subversion" "6" +"icon.png" "7" +"icon@2x.png" "7" +"wizard.json" "7" +"git.ignore" "5" +"qtcreatorplugin" "4" +"myplugin.cpp" "5" +"myplugin.h" "5" +"MyPlugin.json.in" "5" +"myplugin.pro" "5" +"myplugin_global.h" "5" +"mypluginconstants.h" "5" +"qtcreatorplugin.png" "5" +"qtcreatorplugin@2x.png" "5" +"wizard.xml" "5" +"qtquick2-extension" "4" +"lib.png" "5" +"lib@2x.png" "5" +"object.cpp" "5" +"object.h" "5" +"plugin.cpp" "5" +"plugin.h" "5" +"project.pro" "5" +"qmldir" "5" +"wizard.xml" "5" +"qtquickstyleicons" "4" +"default.png" "5" +"default@2x.png" "5" +"material-dark.png" "5" +"material-dark@2x.png" "5" +"material-light.png" "5" +"material-light@2x.png" "5" +"universal-dark.png" "5" +"universal-dark@2x.png" "5" +"universal-light.png" "5" +"universal-light@2x.png" "5" +"README.txt" "4" +"themes" "2" +"dark.creatortheme" "3" +"default.creatortheme" "3" +"flat-dark.creatortheme" "3" +"flat-light.creatortheme" "3" +"flat.creatortheme" "3" +"welcomescreen" "2" +"welcomescreen.qml" "3" +"welcomescreen.qmlproject" "3" "Sources" "0" "src.qbs:6" "1" "app_version_header" "1" @@ -2472,10 +2471,10 @@ "aggregation.qbs:6" "4" "Group 1" "4" "QtcDevHeaders.qbs:10" "5" -"main.h" "7" -"myinterfaces.h" "7" -"aggregate.h" "6" -"aggregation_global.h" "6" +"main.h" "6" +"myinterfaces.h" "6" +"aggregate.h" "5" +"aggregation_global.h" "5" "ClangSupport" "2" "clangsupport.qbs:3" "3" "Group 3" "3" @@ -2904,39 +2903,39 @@ "cplusplus.qbs:6" "4" "Group 1" "4" "QtcDevHeaders.qbs:10" "5" -"AlreadyConsideredClassContainer.h" "6" -"ASTParent.h" "6" -"ASTPath.h" "6" -"BackwardsScanner.h" "6" -"CppDocument.h" "6" -"cppmodelmanagerbase.h" "6" -"CppRewriter.h" "6" -"DependencyTable.h" "6" -"DeprecatedGenTemplateInstance.h" "6" -"ExpressionUnderCursor.h" "6" -"FastPreprocessor.h" "6" -"findcdbbreakpoint.h" "6" -"FindUsages.h" "6" -"Icons.h" "6" -"LookupContext.h" "6" -"LookupItem.h" "6" -"Macro.h" "6" -"MatchingText.h" "6" -"NamePrettyPrinter.h" "6" -"Overview.h" "6" -"pp-cctype.h" "6" -"pp-engine.h" "6" -"pp-scanner.h" "6" -"pp.h" "6" -"PPToken.h" "6" -"PreprocessorClient.h" "6" -"PreprocessorEnvironment.h" "6" -"ResolveExpression.h" "6" -"SimpleLexer.h" "6" -"SnapshotSymbolVisitor.h" "6" -"SymbolNameVisitor.h" "6" -"TypeOfExpression.h" "6" -"TypePrettyPrinter.h" "6" +"AlreadyConsideredClassContainer.h" "5" +"ASTParent.h" "5" +"ASTPath.h" "5" +"BackwardsScanner.h" "5" +"CppDocument.h" "5" +"cppmodelmanagerbase.h" "5" +"CppRewriter.h" "5" +"DependencyTable.h" "5" +"DeprecatedGenTemplateInstance.h" "5" +"ExpressionUnderCursor.h" "5" +"FastPreprocessor.h" "5" +"findcdbbreakpoint.h" "5" +"FindUsages.h" "5" +"Icons.h" "5" +"LookupContext.h" "5" +"LookupItem.h" "5" +"Macro.h" "5" +"MatchingText.h" "5" +"NamePrettyPrinter.h" "5" +"Overview.h" "5" +"pp-cctype.h" "5" +"pp-engine.h" "5" +"pp-scanner.h" "5" +"pp.h" "5" +"PPToken.h" "5" +"PreprocessorClient.h" "5" +"PreprocessorEnvironment.h" "5" +"ResolveExpression.h" "5" +"SimpleLexer.h" "5" +"SnapshotSymbolVisitor.h" "5" +"SymbolNameVisitor.h" "5" +"TypeOfExpression.h" "5" +"TypePrettyPrinter.h" "5" "ExtensionSystem" "2" "extensionsystem.qbs:3" "3" "ExtensionSystem" "3" @@ -2976,19 +2975,19 @@ "extensionsystem.qbs:6" "4" "Group 1" "4" "QtcDevHeaders.qbs:10" "5" -"extensionsystem_global.h" "6" -"invoker.h" "6" -"iplugin.h" "6" -"iplugin_p.h" "6" -"optionsparser.h" "6" -"plugindetailsview.h" "6" -"pluginerroroverview.h" "6" -"pluginerrorview.h" "6" -"pluginmanager.h" "6" -"pluginmanager_p.h" "6" -"pluginspec.h" "6" -"pluginspec_p.h" "6" -"pluginview.h" "6" +"extensionsystem_global.h" "5" +"invoker.h" "5" +"iplugin.h" "5" +"iplugin_p.h" "5" +"optionsparser.h" "5" +"plugindetailsview.h" "5" +"pluginerroroverview.h" "5" +"pluginerrorview.h" "5" +"pluginmanager.h" "5" +"pluginmanager_p.h" "5" +"pluginspec.h" "5" +"pluginspec_p.h" "5" +"pluginview.h" "5" "GLSL" "2" "glsl.qbs:6" "3" "generated parser files" "3" @@ -3049,9 +3048,9 @@ "languageutils.qbs:6" "4" "Group 1" "4" "QtcDevHeaders.qbs:10" "5" -"componentversion.h" "6" -"fakemetaobject.h" "6" -"languageutils_global.h" "6" +"componentversion.h" "5" +"fakemetaobject.h" "5" +"languageutils_global.h" "5" "Modeling" "2" "modelinglib.qbs:3" "3" "Images" "3" @@ -3107,7 +3106,6 @@ "swimlane.png" "8" "Qmt" "3" "modelinglib.qbs:21" "4" -"qmt" "4" "config" "5" "configcontroller.cpp" "6" "configcontroller.h" "6" @@ -3419,12 +3417,10 @@ "voidelementtasks.h" "6" "QStringParser" "3" "modelinglib.qbs:315" "4" -"qstringparser" "4" "qstringparser.cpp" "5" "qstringparser.h" "5" "QtSerialization" "3" "modelinglib.qbs:324" "4" -"qtserialization" "4" "impl" "6" "loadingrefmap.h" "7" "objectid.h" "7" @@ -3498,36 +3494,35 @@ "qmldebug.qbs:6" "4" "Group 1" "4" "QtcDevHeaders.qbs:10" "5" -"baseenginedebugclient.h" "6" -"basetoolsclient.h" "6" -"declarativeenginedebugclient.h" "6" -"declarativeenginedebugclientv2.h" "6" -"declarativetoolsclient.h" "6" -"qdebugmessageclient.h" "6" -"qmldebug_global.h" "6" -"qmldebugclient.h" "6" -"qmldebugcommandlinearguments.h" "6" -"qmldebugconnection.h" "6" -"qmldebugconnectionmanager.h" "6" -"qmldebugconstants.h" "6" -"qmlenginecontrolclient.h" "6" -"qmlenginedebugclient.h" "6" -"qmloutputparser.h" "6" -"qmltoolsclient.h" "6" -"qpacketprotocol.h" "6" +"baseenginedebugclient.h" "5" +"basetoolsclient.h" "5" +"declarativeenginedebugclient.h" "5" +"declarativeenginedebugclientv2.h" "5" +"declarativetoolsclient.h" "5" +"qdebugmessageclient.h" "5" +"qmldebug_global.h" "5" +"qmldebugclient.h" "5" +"qmldebugcommandlinearguments.h" "5" +"qmldebugconnection.h" "5" +"qmldebugconnectionmanager.h" "5" +"qmldebugconstants.h" "5" +"qmlenginecontrolclient.h" "5" +"qmlenginedebugclient.h" "5" +"qmloutputparser.h" "5" +"qmltoolsclient.h" "5" +"qpacketprotocol.h" "5" "QmlEditorWidgets" "2" "qmleditorwidgets.qbs:3" "3" "Easing Pane" "3" "qmleditorwidgets.qbs:36" "4" -"easingpane" "4" -"easingcontextpane.cpp" "5" -"easingcontextpane.h" "5" -"easingcontextpane.ui" "5" -"easinggraph.cpp" "5" -"easinggraph.h" "5" -"easingpane.qrc" "5" -"/qmleditorwidgets" "6" -"qt_logo.png" "7" +"easingcontextpane.cpp" "4" +"easingcontextpane.h" "4" +"easingcontextpane.ui" "4" +"easinggraph.cpp" "4" +"easinggraph.h" "4" +"easingpane.qrc" "4" +"/qmleditorwidgets" "5" +"qt_logo.png" "6" "General" "3" "qmleditorwidgets.qbs:15" "4" "colorbox.cpp" "4" @@ -3714,27 +3709,26 @@ "qmljsviewercontext.h" "5" "Parser" "4" "qmljs.qbs:62" "5" -"parser" "5" -"qmldirparser.cpp" "6" -"qmldirparser_p.h" "6" -"qmlerror.cpp" "6" -"qmlerror.h" "6" -"qmljsast.cpp" "6" -"qmljsast_p.h" "6" -"qmljsastfwd_p.h" "6" -"qmljsastvisitor.cpp" "6" -"qmljsastvisitor_p.h" "6" -"qmljsengine_p.cpp" "6" -"qmljsengine_p.h" "6" -"qmljsglobal_p.h" "6" -"qmljsgrammar.cpp" "6" -"qmljsgrammar_p.h" "6" -"qmljskeywords_p.h" "6" -"qmljslexer.cpp" "6" -"qmljslexer_p.h" "6" -"qmljsmemorypool_p.h" "6" -"qmljsparser.cpp" "6" -"qmljsparser_p.h" "6" +"qmldirparser.cpp" "5" +"qmldirparser_p.h" "5" +"qmlerror.cpp" "5" +"qmlerror.h" "5" +"qmljsast.cpp" "5" +"qmljsast_p.h" "5" +"qmljsastfwd_p.h" "5" +"qmljsastvisitor.cpp" "5" +"qmljsastvisitor_p.h" "5" +"qmljsengine_p.cpp" "5" +"qmljsengine_p.h" "5" +"qmljsglobal_p.h" "5" +"qmljsgrammar.cpp" "5" +"qmljsgrammar_p.h" "5" +"qmljskeywords_p.h" "5" +"qmljslexer.cpp" "5" +"qmljslexer_p.h" "5" +"qmljsmemorypool_p.h" "5" +"qmljsparser.cpp" "5" +"qmljsparser_p.h" "5" "standard pch file (gui)" "4" "QtcProduct.qbs:65" "5" "qtcreator_gui_pch.h" "6" @@ -3745,57 +3739,57 @@ "qmljs.qbs:6" "4" "Group 1" "4" "QtcDevHeaders.qbs:10" "5" -"parser" "6" -"qmldirparser_p.h" "7" -"qmlerror.h" "7" -"qmljsast_p.h" "7" -"qmljsastfwd_p.h" "7" -"qmljsastvisitor_p.h" "7" -"qmljsengine_p.h" "7" -"qmljsglobal_p.h" "7" -"qmljsgrammar_p.h" "7" -"qmljskeywords_p.h" "7" -"qmljslexer_p.h" "7" -"qmljsmemorypool_p.h" "7" -"qmljsparser_p.h" "7" -"jsoncheck.h" "6" -"persistenttrie.h" "6" -"qmljs_global.h" "6" -"qmljsbind.h" "6" -"qmljsbundle.h" "6" -"qmljscheck.h" "6" -"qmljscodeformatter.h" "6" -"qmljscompletioncontextfinder.h" "6" -"qmljsconstants.h" "6" -"qmljscontext.h" "6" -"qmljsdescribevalue.h" "6" -"qmljsdialect.h" "6" -"qmljsdocument.h" "6" -"qmljsevaluate.h" "6" -"qmljsfindexportedcpptypes.h" "6" -"qmljsicons.h" "6" -"qmljsicontextpane.h" "6" -"qmljsimportdependencies.h" "6" -"qmljsindenter.h" "6" -"qmljsinterpreter.h" "6" -"qmljslineinfo.h" "6" -"qmljslink.h" "6" -"qmljsmodelmanagerinterface.h" "6" -"qmljsplugindumper.h" "6" -"qmljspropertyreader.h" "6" -"qmljsqrcparser.h" "6" -"qmljsreformatter.h" "6" -"qmljsrewriter.h" "6" -"qmljsscanner.h" "6" -"qmljsscopeastpath.h" "6" -"qmljsscopebuilder.h" "6" -"qmljsscopechain.h" "6" -"qmljssimplereader.h" "6" -"qmljsstaticanalysismessage.h" "6" -"qmljstypedescriptionreader.h" "6" -"qmljsutils.h" "6" -"qmljsvalueowner.h" "6" -"qmljsviewercontext.h" "6" +"parser" "5" +"qmldirparser_p.h" "6" +"qmlerror.h" "6" +"qmljsast_p.h" "6" +"qmljsastfwd_p.h" "6" +"qmljsastvisitor_p.h" "6" +"qmljsengine_p.h" "6" +"qmljsglobal_p.h" "6" +"qmljsgrammar_p.h" "6" +"qmljskeywords_p.h" "6" +"qmljslexer_p.h" "6" +"qmljsmemorypool_p.h" "6" +"qmljsparser_p.h" "6" +"jsoncheck.h" "5" +"persistenttrie.h" "5" +"qmljs_global.h" "5" +"qmljsbind.h" "5" +"qmljsbundle.h" "5" +"qmljscheck.h" "5" +"qmljscodeformatter.h" "5" +"qmljscompletioncontextfinder.h" "5" +"qmljsconstants.h" "5" +"qmljscontext.h" "5" +"qmljsdescribevalue.h" "5" +"qmljsdialect.h" "5" +"qmljsdocument.h" "5" +"qmljsevaluate.h" "5" +"qmljsfindexportedcpptypes.h" "5" +"qmljsicons.h" "5" +"qmljsicontextpane.h" "5" +"qmljsimportdependencies.h" "5" +"qmljsindenter.h" "5" +"qmljsinterpreter.h" "5" +"qmljslineinfo.h" "5" +"qmljslink.h" "5" +"qmljsmodelmanagerinterface.h" "5" +"qmljsplugindumper.h" "5" +"qmljspropertyreader.h" "5" +"qmljsqrcparser.h" "5" +"qmljsreformatter.h" "5" +"qmljsrewriter.h" "5" +"qmljsscanner.h" "5" +"qmljsscopeastpath.h" "5" +"qmljsscopebuilder.h" "5" +"qmljsscopechain.h" "5" +"qmljssimplereader.h" "5" +"qmljsstaticanalysismessage.h" "5" +"qmljstypedescriptionreader.h" "5" +"qmljsutils.h" "5" +"qmljsvalueowner.h" "5" +"qmljsviewercontext.h" "5" "qtcreator_ctrlc_stub" "2" "process_ctrlc_stub.qbs:3" "3" "standard pch file (gui)" "3" @@ -3955,49 +3949,49 @@ "ssh.qbs:7" "4" "Group 1" "4" "QtcDevHeaders.qbs:10" "5" -"sftpchannel.h" "6" -"sftpchannel_p.h" "6" -"sftpdefs.h" "6" -"sftpfilesystemmodel.h" "6" -"sftpincomingpacket_p.h" "6" -"sftpoperation_p.h" "6" -"sftpoutgoingpacket_p.h" "6" -"sftppacket_p.h" "6" -"ssh_global.h" "6" -"sshagent_p.h" "6" -"sshbotanconversions_p.h" "6" -"sshcapabilities_p.h" "6" -"sshchannel_p.h" "6" -"sshchannelmanager_p.h" "6" -"sshconnection.h" "6" -"sshconnection_p.h" "6" -"sshconnectionmanager.h" "6" -"sshcryptofacility_p.h" "6" -"sshdirecttcpiptunnel.h" "6" -"sshdirecttcpiptunnel_p.h" "6" -"ssherrors.h" "6" -"sshexception_p.h" "6" -"sshforwardedtcpiptunnel.h" "6" -"sshforwardedtcpiptunnel_p.h" "6" -"sshhostkeydatabase.h" "6" -"sshincomingpacket_p.h" "6" -"sshinit_p.h" "6" -"sshkeycreationdialog.h" "6" -"sshkeyexchange_p.h" "6" -"sshkeygenerator.h" "6" -"sshkeypasswordretriever_p.h" "6" -"sshlogging_p.h" "6" -"sshoutgoingpacket_p.h" "6" -"sshpacket_p.h" "6" -"sshpacketparser_p.h" "6" -"sshpseudoterminal.h" "6" -"sshremoteprocess.h" "6" -"sshremoteprocess_p.h" "6" -"sshremoteprocessrunner.h" "6" -"sshsendfacility_p.h" "6" -"sshtcpipforwardserver.h" "6" -"sshtcpipforwardserver_p.h" "6" -"sshtcpiptunnel_p.h" "6" +"sftpchannel.h" "5" +"sftpchannel_p.h" "5" +"sftpdefs.h" "5" +"sftpfilesystemmodel.h" "5" +"sftpincomingpacket_p.h" "5" +"sftpoperation_p.h" "5" +"sftpoutgoingpacket_p.h" "5" +"sftppacket_p.h" "5" +"ssh_global.h" "5" +"sshagent_p.h" "5" +"sshbotanconversions_p.h" "5" +"sshcapabilities_p.h" "5" +"sshchannel_p.h" "5" +"sshchannelmanager_p.h" "5" +"sshconnection.h" "5" +"sshconnection_p.h" "5" +"sshconnectionmanager.h" "5" +"sshcryptofacility_p.h" "5" +"sshdirecttcpiptunnel.h" "5" +"sshdirecttcpiptunnel_p.h" "5" +"ssherrors.h" "5" +"sshexception_p.h" "5" +"sshforwardedtcpiptunnel.h" "5" +"sshforwardedtcpiptunnel_p.h" "5" +"sshhostkeydatabase.h" "5" +"sshincomingpacket_p.h" "5" +"sshinit_p.h" "5" +"sshkeycreationdialog.h" "5" +"sshkeyexchange_p.h" "5" +"sshkeygenerator.h" "5" +"sshkeypasswordretriever_p.h" "5" +"sshlogging_p.h" "5" +"sshoutgoingpacket_p.h" "5" +"sshpacket_p.h" "5" +"sshpacketparser_p.h" "5" +"sshpseudoterminal.h" "5" +"sshremoteprocess.h" "5" +"sshremoteprocess_p.h" "5" +"sshremoteprocessrunner.h" "5" +"sshsendfacility_p.h" "5" +"sshtcpipforwardserver.h" "5" +"sshtcpipforwardserver_p.h" "5" +"sshtcpiptunnel_p.h" "5" "Sqlite" "2" "sqlite.qbs:3" "3" "Group 4" "3" @@ -4098,41 +4092,40 @@ "tracestashfile.h" "5" "QML" "4" "tracing.qbs:42" "5" -"qml" "5" -"tracing.qrc" "6" -"/tracing" "7" -"ButtonsBar.qml" "8" -"CategoryLabel.qml" "8" -"Detail.qml" "8" -"FlameGraphDelegate.qml" "8" -"FlameGraphView.qml" "8" -"ico_edit.png" "8" -"ico_edit@2x.png" "8" -"ico_rangeselected.png" "8" -"ico_rangeselected@2x.png" "8" -"ico_rangeselection.png" "8" -"ico_rangeselection@2x.png" "8" -"ico_selectionmode.png" "8" -"ico_selectionmode@2x.png" "8" -"ImageToolButton.qml" "8" -"MainView.qml" "8" -"notes.frag" "8" -"notes.vert" "8" -"Overview.qml" "8" -"range_handle.png" "8" -"RangeDetails.qml" "8" -"RangeMover.qml" "8" -"RowLabel.qml" "8" -"SelectionRange.qml" "8" -"SelectionRangeDetails.qml" "8" -"TimeDisplay.qml" "8" -"TimelineContent.qml" "8" -"timelineitems.frag" "8" -"timelineitems.vert" "8" -"TimelineLabels.qml" "8" -"TimelineRulers.qml" "8" -"TimelineText.qml" "8" -"TimeMarks.qml" "8" +"tracing.qrc" "5" +"/tracing" "6" +"ButtonsBar.qml" "7" +"CategoryLabel.qml" "7" +"Detail.qml" "7" +"FlameGraphDelegate.qml" "7" +"FlameGraphView.qml" "7" +"ico_edit.png" "7" +"ico_edit@2x.png" "7" +"ico_rangeselected.png" "7" +"ico_rangeselected@2x.png" "7" +"ico_rangeselection.png" "7" +"ico_rangeselection@2x.png" "7" +"ico_selectionmode.png" "7" +"ico_selectionmode@2x.png" "7" +"ImageToolButton.qml" "7" +"MainView.qml" "7" +"notes.frag" "7" +"notes.vert" "7" +"Overview.qml" "7" +"range_handle.png" "7" +"RangeDetails.qml" "7" +"RangeMover.qml" "7" +"RowLabel.qml" "7" +"SelectionRange.qml" "7" +"SelectionRangeDetails.qml" "7" +"TimeDisplay.qml" "7" +"TimelineContent.qml" "7" +"timelineitems.frag" "7" +"timelineitems.vert" "7" +"TimelineLabels.qml" "7" +"TimelineRulers.qml" "7" +"TimelineText.qml" "7" +"TimeMarks.qml" "7" "standard pch file (gui)" "4" "QtcProduct.qbs:65" "5" "qtcreator_gui_pch.h" "6" @@ -4147,35 +4140,35 @@ "tracing.qbs:8" "4" "Group 1" "4" "QtcDevHeaders.qbs:10" "5" -"flamegraph.h" "6" -"flamegraphattached.h" "6" -"runscenegraphtest.h" "6" -"timelineabstractrenderer.h" "6" -"timelineabstractrenderer_p.h" "6" -"timelineformattime.h" "6" -"timelineitemsrenderpass.h" "6" -"timelinemodel.h" "6" -"timelinemodel_p.h" "6" -"timelinemodelaggregator.h" "6" -"timelinenotesmodel.h" "6" -"timelinenotesmodel_p.h" "6" -"timelinenotesrenderpass.h" "6" -"timelineoverviewrenderer.h" "6" -"timelineoverviewrenderer_p.h" "6" -"timelinerenderer.h" "6" -"timelinerenderer_p.h" "6" -"timelinerenderpass.h" "6" -"timelinerenderstate.h" "6" -"timelinerenderstate_p.h" "6" -"timelineselectionrenderpass.h" "6" -"timelinetheme.h" "6" -"timelinetracefile.h" "6" -"timelinetracemanager.h" "6" -"timelinezoomcontrol.h" "6" -"traceevent.h" "6" -"traceeventtype.h" "6" -"tracestashfile.h" "6" -"tracing_global.h" "6" +"flamegraph.h" "5" +"flamegraphattached.h" "5" +"runscenegraphtest.h" "5" +"timelineabstractrenderer.h" "5" +"timelineabstractrenderer_p.h" "5" +"timelineformattime.h" "5" +"timelineitemsrenderpass.h" "5" +"timelinemodel.h" "5" +"timelinemodel_p.h" "5" +"timelinemodelaggregator.h" "5" +"timelinenotesmodel.h" "5" +"timelinenotesmodel_p.h" "5" +"timelinenotesrenderpass.h" "5" +"timelineoverviewrenderer.h" "5" +"timelineoverviewrenderer_p.h" "5" +"timelinerenderer.h" "5" +"timelinerenderer_p.h" "5" +"timelinerenderpass.h" "5" +"timelinerenderstate.h" "5" +"timelinerenderstate_p.h" "5" +"timelineselectionrenderpass.h" "5" +"timelinetheme.h" "5" +"timelinetracefile.h" "5" +"timelinetracemanager.h" "5" +"timelinezoomcontrol.h" "5" +"traceevent.h" "5" +"traceeventtype.h" "5" +"tracestashfile.h" "5" +"tracing_global.h" "5" "Utils" "2" "utils.qbs:4" "3" "Utils" "3" @@ -4189,23 +4182,22 @@ "fileutils_mac.mm" "5" "MimeTypes" "4" "utils.qbs:325" "5" -"mimetypes" "5" -"mimedatabase.cpp" "6" -"mimedatabase.h" "6" -"mimedatabase_p.h" "6" -"mimeglobpattern.cpp" "6" -"mimeglobpattern_p.h" "6" -"mimemagicrule.cpp" "6" -"mimemagicrule_p.h" "6" -"mimemagicrulematcher.cpp" "6" -"mimemagicrulematcher_p.h" "6" -"mimeprovider.cpp" "6" -"mimeprovider_p.h" "6" -"mimetype.cpp" "6" -"mimetype.h" "6" -"mimetype_p.h" "6" -"mimetypeparser.cpp" "6" -"mimetypeparser_p.h" "6" +"mimedatabase.cpp" "5" +"mimedatabase.h" "5" +"mimedatabase_p.h" "5" +"mimeglobpattern.cpp" "5" +"mimeglobpattern_p.h" "5" +"mimemagicrule.cpp" "5" +"mimemagicrule_p.h" "5" +"mimemagicrulematcher.cpp" "5" +"mimemagicrulematcher_p.h" "5" +"mimeprovider.cpp" "5" +"mimeprovider_p.h" "5" +"mimetype.cpp" "5" +"mimetype.h" "5" +"mimetype_p.h" "5" +"mimetypeparser.cpp" "5" +"mimetypeparser_p.h" "5" "ProcessHandle_macos" "4" "utils.qbs:317" "5" "processhandle_mac.mm" "5" @@ -4217,19 +4209,17 @@ "qtcreator_pch.h" "6" "Theme" "4" "utils.qbs:270" "5" -"theme" "5" -"theme.cpp" "6" -"theme.h" "6" -"theme_p.h" "6" +"theme.cpp" "5" +"theme.h" "5" +"theme_p.h" "5" "Tooltip" "4" "utils.qbs:280" "5" -"tooltip" "5" -"effects.h" "6" -"reuse.h" "6" -"tips.cpp" "6" -"tips.h" "6" -"tooltip.cpp" "6" -"tooltip.h" "6" +"effects.h" "5" +"reuse.h" "5" +"tips.cpp" "5" +"tips.h" "5" +"tooltip.cpp" "5" +"tooltip.h" "5" "WindowsUtils" "4" "utils.qbs:293" "5" "consoleprocess_win.cpp" "5" @@ -4888,150 +4878,150 @@ "utils.qbs:7" "4" "Group 1" "4" "QtcDevHeaders.qbs:10" "5" -"mimetypes" "6" -"mimedatabase.h" "7" -"mimedatabase_p.h" "7" -"mimeglobpattern_p.h" "7" -"mimemagicrule_p.h" "7" -"mimemagicrulematcher_p.h" "7" -"mimeprovider_p.h" "7" -"mimetype.h" "7" -"mimetype_p.h" "7" -"mimetypeparser_p.h" "7" -"theme" "6" -"theme.h" "7" -"theme_p.h" "7" -"tooltip" "6" -"effects.h" "7" -"reuse.h" "7" -"tips.h" "7" -"tooltip.h" "7" -"algorithm.h" "6" -"annotateditemdelegate.h" "6" -"ansiescapecodehandler.h" "6" -"appmainwindow.h" "6" -"basetreeview.h" "6" -"benchmarker.h" "6" -"buildablehelperlibrary.h" "6" -"categorysortfiltermodel.h" "6" -"changeset.h" "6" -"checkablemessagebox.h" "6" -"classnamevalidatinglineedit.h" "6" -"codegeneration.h" "6" -"completinglineedit.h" "6" -"completingtextedit.h" "6" -"consoleprocess.h" "6" -"consoleprocess_p.h" "6" -"crumblepath.h" "6" -"declarationmacros.h" "6" -"detailsbutton.h" "6" -"detailswidget.h" "6" -"dropsupport.h" "6" -"elfreader.h" "6" -"elidinglabel.h" "6" -"environment.h" "6" -"environmentdialog.h" "6" -"environmentmodel.h" "6" -"execmenu.h" "6" -"executeondestruction.h" "6" -"fadingindicator.h" "6" -"faketooltip.h" "6" -"fancylineedit.h" "6" -"fancymainwindow.h" "6" -"filecrumblabel.h" "6" -"fileinprojectfinder.h" "6" -"filenamevalidatinglineedit.h" "6" -"filesearch.h" "6" -"filesystemwatcher.h" "6" -"fileutils.h" "6" -"fileutils_mac.h" "6" -"filewizardpage.h" "6" -"fixedsizeclicklabel.h" "6" -"flowlayout.h" "6" -"functiontraits.h" "6" -"fuzzymatcher.h" "6" -"guard.h" "6" -"headerviewstretcher.h" "6" -"highlightingitemdelegate.h" "6" -"historycompleter.h" "6" -"hostosinfo.h" "6" -"htmldocextractor.h" "6" -"icon.h" "6" -"itemviews.h" "6" -"json.h" "6" -"linecolumn.h" "6" -"link.h" "6" -"listutils.h" "6" -"macroexpander.h" "6" -"mapreduce.h" "6" -"navigationtreeview.h" "6" -"networkaccessmanager.h" "6" -"newclasswidget.h" "6" -"optional.h" "6" -"osspecificaspects.h" "6" -"outputformat.h" "6" -"outputformatter.h" "6" -"overridecursor.h" "6" -"parameteraction.h" "6" -"pathchooser.h" "6" -"pathlisteditor.h" "6" -"persistentsettings.h" "6" -"pointeralgorithm.h" "6" -"port.h" "6" -"portlist.h" "6" -"predicates.h" "6" -"processhandle.h" "6" -"progressindicator.h" "6" -"projectintropage.h" "6" -"proxyaction.h" "6" -"proxycredentialsdialog.h" "6" -"qtcassert.h" "6" -"qtcolorbutton.h" "6" -"qtcprocess.h" "6" -"reloadpromptutils.h" "6" -"removefiledialog.h" "6" -"runextensions.h" "6" -"savedaction.h" "6" -"savefile.h" "6" -"scopedswap.h" "6" -"settingsaccessor.h" "6" -"settingsselector.h" "6" -"settingsutils.h" "6" -"shellcommand.h" "6" -"shellcommandpage.h" "6" -"sizedarray.h" "6" -"smallstring.h" "6" -"smallstringfwd.h" "6" -"smallstringio.h" "6" -"smallstringiterator.h" "6" -"smallstringlayout.h" "6" -"smallstringliteral.h" "6" -"smallstringmemory.h" "6" -"smallstringvector.h" "6" -"smallstringview.h" "6" -"statuslabel.h" "6" -"stringutils.h" "6" -"styledbar.h" "6" -"stylehelper.h" "6" -"synchronousprocess.h" "6" -"templateengine.h" "6" -"temporarydirectory.h" "6" -"temporaryfile.h" "6" -"textfieldcheckbox.h" "6" -"textfieldcombobox.h" "6" -"textfileformat.h" "6" -"textutils.h" "6" -"treemodel.h" "6" -"treeviewcombobox.h" "6" -"uncommentselection.h" "6" -"unixutils.h" "6" -"url.h" "6" -"utils_global.h" "6" -"utilsicons.h" "6" -"variant.h" "6" -"winutils.h" "6" -"wizard.h" "6" -"wizardpage.h" "6" +"mimetypes" "5" +"mimedatabase.h" "6" +"mimedatabase_p.h" "6" +"mimeglobpattern_p.h" "6" +"mimemagicrule_p.h" "6" +"mimemagicrulematcher_p.h" "6" +"mimeprovider_p.h" "6" +"mimetype.h" "6" +"mimetype_p.h" "6" +"mimetypeparser_p.h" "6" +"theme" "5" +"theme.h" "6" +"theme_p.h" "6" +"tooltip" "5" +"effects.h" "6" +"reuse.h" "6" +"tips.h" "6" +"tooltip.h" "6" +"algorithm.h" "5" +"annotateditemdelegate.h" "5" +"ansiescapecodehandler.h" "5" +"appmainwindow.h" "5" +"basetreeview.h" "5" +"benchmarker.h" "5" +"buildablehelperlibrary.h" "5" +"categorysortfiltermodel.h" "5" +"changeset.h" "5" +"checkablemessagebox.h" "5" +"classnamevalidatinglineedit.h" "5" +"codegeneration.h" "5" +"completinglineedit.h" "5" +"completingtextedit.h" "5" +"consoleprocess.h" "5" +"consoleprocess_p.h" "5" +"crumblepath.h" "5" +"declarationmacros.h" "5" +"detailsbutton.h" "5" +"detailswidget.h" "5" +"dropsupport.h" "5" +"elfreader.h" "5" +"elidinglabel.h" "5" +"environment.h" "5" +"environmentdialog.h" "5" +"environmentmodel.h" "5" +"execmenu.h" "5" +"executeondestruction.h" "5" +"fadingindicator.h" "5" +"faketooltip.h" "5" +"fancylineedit.h" "5" +"fancymainwindow.h" "5" +"filecrumblabel.h" "5" +"fileinprojectfinder.h" "5" +"filenamevalidatinglineedit.h" "5" +"filesearch.h" "5" +"filesystemwatcher.h" "5" +"fileutils.h" "5" +"fileutils_mac.h" "5" +"filewizardpage.h" "5" +"fixedsizeclicklabel.h" "5" +"flowlayout.h" "5" +"functiontraits.h" "5" +"fuzzymatcher.h" "5" +"guard.h" "5" +"headerviewstretcher.h" "5" +"highlightingitemdelegate.h" "5" +"historycompleter.h" "5" +"hostosinfo.h" "5" +"htmldocextractor.h" "5" +"icon.h" "5" +"itemviews.h" "5" +"json.h" "5" +"linecolumn.h" "5" +"link.h" "5" +"listutils.h" "5" +"macroexpander.h" "5" +"mapreduce.h" "5" +"navigationtreeview.h" "5" +"networkaccessmanager.h" "5" +"newclasswidget.h" "5" +"optional.h" "5" +"osspecificaspects.h" "5" +"outputformat.h" "5" +"outputformatter.h" "5" +"overridecursor.h" "5" +"parameteraction.h" "5" +"pathchooser.h" "5" +"pathlisteditor.h" "5" +"persistentsettings.h" "5" +"pointeralgorithm.h" "5" +"port.h" "5" +"portlist.h" "5" +"predicates.h" "5" +"processhandle.h" "5" +"progressindicator.h" "5" +"projectintropage.h" "5" +"proxyaction.h" "5" +"proxycredentialsdialog.h" "5" +"qtcassert.h" "5" +"qtcolorbutton.h" "5" +"qtcprocess.h" "5" +"reloadpromptutils.h" "5" +"removefiledialog.h" "5" +"runextensions.h" "5" +"savedaction.h" "5" +"savefile.h" "5" +"scopedswap.h" "5" +"settingsaccessor.h" "5" +"settingsselector.h" "5" +"settingsutils.h" "5" +"shellcommand.h" "5" +"shellcommandpage.h" "5" +"sizedarray.h" "5" +"smallstring.h" "5" +"smallstringfwd.h" "5" +"smallstringio.h" "5" +"smallstringiterator.h" "5" +"smallstringlayout.h" "5" +"smallstringliteral.h" "5" +"smallstringmemory.h" "5" +"smallstringvector.h" "5" +"smallstringview.h" "5" +"statuslabel.h" "5" +"stringutils.h" "5" +"styledbar.h" "5" +"stylehelper.h" "5" +"synchronousprocess.h" "5" +"templateengine.h" "5" +"temporarydirectory.h" "5" +"temporaryfile.h" "5" +"textfieldcheckbox.h" "5" +"textfieldcombobox.h" "5" +"textfileformat.h" "5" +"textutils.h" "5" +"treemodel.h" "5" +"treeviewcombobox.h" "5" +"uncommentselection.h" "5" +"unixutils.h" "5" +"url.h" "5" +"utils_global.h" "5" +"utilsicons.h" "5" +"variant.h" "5" +"winutils.h" "5" +"wizard.h" "5" +"wizardpage.h" "5" "Plugins" "1" "plugins.qbs:3" "2" "Android" "2" @@ -5040,7 +5030,7 @@ "android.qbs:8" "4" "PluginMetaData" "4" "QtcPlugin.qbs:49" "5" -"Android.json.in" "6" +"Android.json.in" "5" "standard pch file (gui)" "4" "QtcProduct.qbs:65" "5" "qtcreator_gui_pch.h" "6" @@ -5160,54 +5150,54 @@ "android.qbs:6" "4" "Group 1" "4" "QtcDevHeaders.qbs:10" "5" -"adbcommandswidget.h" "6" -"android_global.h" "6" -"androidavdmanager.h" "6" -"androidbuildapkstep.h" "6" -"androidbuildapkwidget.h" "6" -"androidconfigurations.h" "6" -"androidconstants.h" "6" -"androidcreatekeystorecertificate.h" "6" -"androiddebugsupport.h" "6" -"androiddeployconfiguration.h" "6" -"androiddeployqtstep.h" "6" -"androiddeployqtwidget.h" "6" -"androiddevice.h" "6" -"androiddevicedialog.h" "6" -"androiddevicefactory.h" "6" -"androiderrormessage.h" "6" -"androidgdbserverkitinformation.h" "6" -"androidglobal.h" "6" -"androidmanager.h" "6" -"androidmanifestdocument.h" "6" -"androidmanifesteditor.h" "6" -"androidmanifesteditorfactory.h" "6" -"androidmanifesteditorwidget.h" "6" -"androidpackageinstallationstep.h" "6" -"androidplugin.h" "6" -"androidpotentialkit.h" "6" -"androidqmltoolingsupport.h" "6" -"androidqtsupport.h" "6" -"androidqtversion.h" "6" -"androidqtversionfactory.h" "6" -"androidrunconfiguration.h" "6" -"androidruncontrol.h" "6" -"androidrunner.h" "6" -"androidrunnerworker.h" "6" -"androidsdkmanager.h" "6" -"androidsdkmanagerwidget.h" "6" -"androidsdkmodel.h" "6" -"androidsdkpackage.h" "6" -"androidsettingspage.h" "6" -"androidsettingswidget.h" "6" -"androidsignaloperation.h" "6" -"androidtoolchain.h" "6" -"androidtoolmanager.h" "6" -"avddialog.h" "6" -"certificatesmodel.h" "6" -"javaeditor.h" "6" -"javaindenter.h" "6" -"javaparser.h" "6" +"adbcommandswidget.h" "5" +"android_global.h" "5" +"androidavdmanager.h" "5" +"androidbuildapkstep.h" "5" +"androidbuildapkwidget.h" "5" +"androidconfigurations.h" "5" +"androidconstants.h" "5" +"androidcreatekeystorecertificate.h" "5" +"androiddebugsupport.h" "5" +"androiddeployconfiguration.h" "5" +"androiddeployqtstep.h" "5" +"androiddeployqtwidget.h" "5" +"androiddevice.h" "5" +"androiddevicedialog.h" "5" +"androiddevicefactory.h" "5" +"androiderrormessage.h" "5" +"androidgdbserverkitinformation.h" "5" +"androidglobal.h" "5" +"androidmanager.h" "5" +"androidmanifestdocument.h" "5" +"androidmanifesteditor.h" "5" +"androidmanifesteditorfactory.h" "5" +"androidmanifesteditorwidget.h" "5" +"androidpackageinstallationstep.h" "5" +"androidplugin.h" "5" +"androidpotentialkit.h" "5" +"androidqmltoolingsupport.h" "5" +"androidqtsupport.h" "5" +"androidqtversion.h" "5" +"androidqtversionfactory.h" "5" +"androidrunconfiguration.h" "5" +"androidruncontrol.h" "5" +"androidrunner.h" "5" +"androidrunnerworker.h" "5" +"androidsdkmanager.h" "5" +"androidsdkmanagerwidget.h" "5" +"androidsdkmodel.h" "5" +"androidsdkpackage.h" "5" +"androidsettingspage.h" "5" +"androidsettingswidget.h" "5" +"androidsignaloperation.h" "5" +"androidtoolchain.h" "5" +"androidtoolmanager.h" "5" +"avddialog.h" "5" +"certificatesmodel.h" "5" +"javaeditor.h" "5" +"javaindenter.h" "5" +"javaparser.h" "5" "AutoTest" "2" "autotest.qbs:3" "3" "Auto Test Wizard" "3" @@ -5239,7 +5229,7 @@ "gtestvisitors.h" "5" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"AutoTest.json.in" "5" +"AutoTest.json.in" "4" "QtTest framework files" "3" "autotest.qbs:83" "4" "qtest" "4" @@ -5459,7 +5449,7 @@ "autotoolsprojectmanager.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"AutotoolsProjectManager.json.in" "5" +"AutotoolsProjectManager.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -5495,7 +5485,7 @@ "baremetal.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"BareMetal.json.in" "5" +"BareMetal.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -5550,7 +5540,7 @@ "bazaar.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"Bazaar.json.in" "5" +"Bazaar.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -5591,29 +5581,27 @@ "beautifier.qbs:3" "3" "ArtisticStyle" "3" "beautifier.qbs:40" "4" -"artisticstyle" "4" -"artisticstyle.cpp" "5" -"artisticstyle.h" "5" -"artisticstyleconstants.h" "5" -"artisticstyleoptionspage.cpp" "5" -"artisticstyleoptionspage.h" "5" -"artisticstyleoptionspage.ui" "5" -"artisticstylesettings.cpp" "5" -"artisticstylesettings.h" "5" +"artisticstyle.cpp" "4" +"artisticstyle.h" "4" +"artisticstyleconstants.h" "4" +"artisticstyleoptionspage.cpp" "4" +"artisticstyleoptionspage.h" "4" +"artisticstyleoptionspage.ui" "4" +"artisticstylesettings.cpp" "4" +"artisticstylesettings.h" "4" "ClangFormat" "3" "beautifier.qbs:55" "4" -"clangformat" "4" -"clangformat.cpp" "5" -"clangformat.h" "5" -"clangformatconstants.h" "5" -"clangformatoptionspage.cpp" "5" -"clangformatoptionspage.h" "5" -"clangformatoptionspage.ui" "5" -"clangformatsettings.cpp" "5" -"clangformatsettings.h" "5" +"clangformat.cpp" "4" +"clangformat.h" "4" +"clangformatconstants.h" "4" +"clangformatoptionspage.cpp" "4" +"clangformatoptionspage.h" "4" +"clangformatoptionspage.ui" "4" +"clangformatsettings.cpp" "4" +"clangformatsettings.h" "4" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"Beautifier.json.in" "5" +"Beautifier.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -5622,15 +5610,14 @@ "qtcreator_pch.h" "5" "Uncrustify" "3" "beautifier.qbs:70" "4" -"uncrustify" "4" -"uncrustify.cpp" "5" -"uncrustify.h" "5" -"uncrustifyconstants.h" "5" -"uncrustifyoptionspage.cpp" "5" -"uncrustifyoptionspage.h" "5" -"uncrustifyoptionspage.ui" "5" -"uncrustifysettings.cpp" "5" -"uncrustifysettings.h" "5" +"uncrustify.cpp" "4" +"uncrustify.h" "4" +"uncrustifyconstants.h" "4" +"uncrustifyoptionspage.cpp" "4" +"uncrustifyoptionspage.h" "4" +"uncrustifyoptionspage.ui" "4" +"uncrustifysettings.cpp" "4" +"uncrustifysettings.h" "4" "abstractsettings.cpp" "3" "abstractsettings.h" "3" "beautifier.qrc" "3" @@ -5661,7 +5648,7 @@ "bineditor.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"BinEditor.json.in" "5" +"BinEditor.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -5681,7 +5668,7 @@ "bookmarks.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"Bookmarks.json.in" "5" +"Bookmarks.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -5705,7 +5692,7 @@ "README" "4" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"ClangCodeModel.json.in" "5" +"ClangCodeModel.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -5714,32 +5701,58 @@ "qtcreator_pch.h" "5" "Test resources" "3" "clangcodemodel.qbs:127" "4" -"completionWithProject.cpp" "5" -"constructorCompletion.cpp" "5" -"dotToArrowCorrection.cpp" "5" -"doxygenKeywordsCompletion.cpp" "5" -"functionCompletion.cpp" "5" -"globalCompletion.cpp" "5" -"includeDirectiveCompletion.cpp" "5" -"memberCompletion.cpp" "5" -"myheader.h" "5" -"mysource.cpp" "5" -"noDotToArrowCorrectionForFloats.cpp" "5" -"objc_messages_1.mm" "5" -"objc_messages_2.mm" "5" -"objc_messages_3.mm" "5" -"preprocessorKeywordsCompletion.cpp" "5" +"completionWithProject.cpp" "4" +"constructorCompletion.cpp" "4" +"dotToArrowCorrection.cpp" "4" +"doxygenKeywordsCompletion.cpp" "4" +"functionCompletion.cpp" "4" +"globalCompletion.cpp" "4" +"includeDirectiveCompletion.cpp" "4" +"memberCompletion.cpp" "4" +"myheader.h" "4" +"mysource.cpp" "4" +"noDotToArrowCorrectionForFloats.cpp" "4" +"objc_messages_1.mm" "4" +"objc_messages_2.mm" "4" +"objc_messages_3.mm" "4" +"preprocessorKeywordsCompletion.cpp" "4" "Tests" "3" "clangcodemodel.qbs:112" "4" -"test" "4" -"data" "5" -"clangtestdata.qrc" "6" -"clangautomationutils.cpp" "5" -"clangautomationutils.h" "5" -"clangbatchfileprocessor.cpp" "5" -"clangbatchfileprocessor.h" "5" -"clangcodecompletion_test.cpp" "5" -"clangcodecompletion_test.h" "5" +"data" "4" +"clangtestdata.qrc" "5" +"/unittests/ClangCodeModel" "6" +"exampleIncludeDir" "7" +"mylib" "8" +"mylib.h" "9" +"file.h" "8" +"otherFile.h" "8" +"qt-widgets-app" "7" +"main.cpp" "8" +"mainwindow.cpp" "8" +"mainwindow.h" "8" +"mainwindow.ui" "8" +"qt-widgets-app.pro" "8" +"completionWithProject.cpp" "7" +"constructorCompletion.cpp" "7" +"dotToArrowCorrection.cpp" "7" +"doxygenKeywordsCompletion.cpp" "7" +"functionCompletion.cpp" "7" +"globalCompletion.cpp" "7" +"includeDirectiveCompletion.cpp" "7" +"memberCompletion.cpp" "7" +"myheader.h" "7" +"mysource.cpp" "7" +"noDotToArrowCorrectionForFloats.cpp" "7" +"objc_messages_1.mm" "7" +"objc_messages_2.mm" "7" +"objc_messages_3.mm" "7" +"preprocessorKeywordsCompletion.cpp" "7" +"clangautomationutils.cpp" "4" +"clangautomationutils.h" "4" +"clangbatchfileprocessor.cpp" "4" +"clangbatchfileprocessor.h" "4" +"clangcodecompletion_test.cpp" "4" +"clangcodecompletion_test.h" "4" "clangactivationsequencecontextprocessor.cpp" "3" "clangactivationsequencecontextprocessor.h" "3" "clangactivationsequenceprocessor.cpp" "3" @@ -5819,7 +5832,7 @@ "clangpchmanager.qbs:4" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"ClangPchManager.json.in" "5" +"ClangPchManager.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -5845,7 +5858,7 @@ "clangrefactoring.qbs:4" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"ClangRefactoring.json.in" "5" +"ClangRefactoring.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -5914,7 +5927,7 @@ "creator-clang-static-analyzer.qdoc" "5" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"ClangTools.json.in" "5" +"ClangTools.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -5923,39 +5936,38 @@ "qtcreator_pch.h" "5" "Unit test resources" "3" "clangtools.qbs:104" "4" -"unit-tests" "4" -"clangtidy_clazy" "5" -"clangtidy_clazy.pro" "6" -"clazy_example.cpp" "6" -"tidy_example.cpp" "6" -"mingw-includes" "5" -"main.cpp" "6" -"mingw-includes.pro" "6" -"mingw-includes.qbs" "6" -"qt-essential-includes" "5" -"main.cpp" "6" -"qt-essential-includes.pro" "6" -"qt-essential-includes.qbs" "6" -"qt-widgets-app" "5" -"main.cpp" "6" -"mainwindow.cpp" "6" -"mainwindow.h" "6" -"mainwindow.ui" "6" -"qt-widgets-app.pro" "6" -"qt-widgets-app.qbs" "6" -"simple" "5" -"main.cpp" "6" -"simple.pro" "6" -"simple.qbs" "6" -"simple-library" "5" -"simple-library.cpp" "6" -"simple-library.h" "6" -"simple-library.pro" "6" -"simple-library.qbs" "6" -"stdc++11-includes" "5" -"main.cpp" "6" -"stdc++11-includes.pro" "6" -"stdc++11-includes.qbs" "6" +"clangtidy_clazy" "4" +"clangtidy_clazy.pro" "5" +"clazy_example.cpp" "5" +"tidy_example.cpp" "5" +"mingw-includes" "4" +"main.cpp" "5" +"mingw-includes.pro" "5" +"mingw-includes.qbs" "5" +"qt-essential-includes" "4" +"main.cpp" "5" +"qt-essential-includes.pro" "5" +"qt-essential-includes.qbs" "5" +"qt-widgets-app" "4" +"main.cpp" "5" +"mainwindow.cpp" "5" +"mainwindow.h" "5" +"mainwindow.ui" "5" +"qt-widgets-app.pro" "5" +"qt-widgets-app.qbs" "5" +"simple" "4" +"main.cpp" "5" +"simple.pro" "5" +"simple.qbs" "5" +"simple-library" "4" +"simple-library.cpp" "5" +"simple-library.h" "5" +"simple-library.pro" "5" +"simple-library.qbs" "5" +"stdc++11-includes" "4" +"main.cpp" "5" +"stdc++11-includes.pro" "5" +"stdc++11-includes.qbs" "5" "Unit tests" "3" "clangtools.qbs:92" "4" "clangtoolspreconfiguredsessiontests.cpp" "4" @@ -5963,6 +5975,36 @@ "clangtoolsunittests.cpp" "4" "clangtoolsunittests.h" "4" "clangtoolsunittests.qrc" "4" +"/" "5" +"unit-tests" "6" +"clangtidy_clazy" "7" +"clangtidy_clazy.pro" "8" +"clazy_example.cpp" "8" +"tidy_example.cpp" "8" +"qt-essential-includes" "7" +"main.cpp" "8" +"qt-essential-includes.pro" "8" +"qt-essential-includes.qbs" "8" +"qt-widgets-app" "7" +"main.cpp" "8" +"mainwindow.cpp" "8" +"mainwindow.h" "8" +"mainwindow.ui" "8" +"qt-widgets-app.pro" "8" +"qt-widgets-app.qbs" "8" +"simple" "7" +"main.cpp" "8" +"simple.pro" "8" +"simple.qbs" "8" +"simple-library" "7" +"simple-library.cpp" "8" +"simple-library.h" "8" +"simple-library.pro" "8" +"simple-library.qbs" "8" +"stdc++11-includes" "7" +"main.cpp" "8" +"stdc++11-includes.pro" "8" +"stdc++11-includes.qbs" "8" "clangfileinfo.h" "3" "clangfixitsrefactoringchanges.cpp" "3" "clangfixitsrefactoringchanges.h" "3" @@ -6012,7 +6054,7 @@ "classview.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"ClassView.json.in" "5" +"ClassView.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -6044,7 +6086,7 @@ "clearcase.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"ClearCase.json.in" "5" +"ClearCase.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -6084,7 +6126,7 @@ "cmakeprojectmanager.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"CMakeProjectManager.json.in" "5" +"CMakeProjectManager.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -6172,7 +6214,7 @@ "cpaster.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"CodePaster.json.in" "5" +"CodePaster.json.in" "4" "Shared" "3" "cpaster.qbs:53" "4" "cgi.cpp" "5" @@ -6230,134 +6272,130 @@ "coreplugin.qbs:9" "4" "Action Manager" "4" "coreplugin.qbs:191" "5" -"actionmanager" "5" -"actioncontainer.cpp" "6" -"actioncontainer.h" "6" -"actioncontainer_p.h" "6" -"actionmanager.cpp" "6" -"actionmanager.h" "6" -"actionmanager_p.h" "6" -"command.cpp" "6" -"command.h" "6" -"command_p.h" "6" -"commandbutton.cpp" "6" -"commandbutton.h" "6" -"commandmappings.cpp" "6" -"commandmappings.h" "6" -"commandsfile.cpp" "6" -"commandsfile.h" "6" +"actioncontainer.cpp" "5" +"actioncontainer.h" "5" +"actioncontainer_p.h" "5" +"actionmanager.cpp" "5" +"actionmanager.h" "5" +"actionmanager_p.h" "5" +"command.cpp" "5" +"command.h" "5" +"command_p.h" "5" +"commandbutton.cpp" "5" +"commandbutton.h" "5" +"commandmappings.cpp" "5" +"commandmappings.h" "5" +"commandsfile.cpp" "5" +"commandsfile.h" "5" "Dialogs" "4" "coreplugin.qbs:204" "5" -"dialogs" "5" -"addtovcsdialog.cpp" "6" -"addtovcsdialog.h" "6" -"addtovcsdialog.ui" "6" -"externaltoolconfig.cpp" "6" -"externaltoolconfig.h" "6" -"externaltoolconfig.ui" "6" -"filepropertiesdialog.cpp" "6" -"filepropertiesdialog.h" "6" -"filepropertiesdialog.ui" "6" -"ioptionspage.cpp" "6" -"ioptionspage.h" "6" -"newdialog.cpp" "6" -"newdialog.h" "6" -"newdialog.ui" "6" -"openwithdialog.cpp" "6" -"openwithdialog.h" "6" -"openwithdialog.ui" "6" -"promptoverwritedialog.cpp" "6" -"promptoverwritedialog.h" "6" -"readonlyfilesdialog.cpp" "6" -"readonlyfilesdialog.h" "6" -"readonlyfilesdialog.ui" "6" -"saveitemsdialog.cpp" "6" -"saveitemsdialog.h" "6" -"saveitemsdialog.ui" "6" -"settingsdialog.cpp" "6" -"settingsdialog.h" "6" -"shortcutsettings.cpp" "6" -"shortcutsettings.h" "6" +"addtovcsdialog.cpp" "5" +"addtovcsdialog.h" "5" +"addtovcsdialog.ui" "5" +"externaltoolconfig.cpp" "5" +"externaltoolconfig.h" "5" +"externaltoolconfig.ui" "5" +"filepropertiesdialog.cpp" "5" +"filepropertiesdialog.h" "5" +"filepropertiesdialog.ui" "5" +"ioptionspage.cpp" "5" +"ioptionspage.h" "5" +"newdialog.cpp" "5" +"newdialog.h" "5" +"newdialog.ui" "5" +"openwithdialog.cpp" "5" +"openwithdialog.h" "5" +"openwithdialog.ui" "5" +"promptoverwritedialog.cpp" "5" +"promptoverwritedialog.h" "5" +"readonlyfilesdialog.cpp" "5" +"readonlyfilesdialog.h" "5" +"readonlyfilesdialog.ui" "5" +"saveitemsdialog.cpp" "5" +"saveitemsdialog.h" "5" +"saveitemsdialog.ui" "5" +"settingsdialog.cpp" "5" +"settingsdialog.h" "5" +"shortcutsettings.cpp" "5" +"shortcutsettings.h" "5" "Editor Manager" "4" "coreplugin.qbs:222" "5" -"editormanager" "5" -"documentmodel.cpp" "6" -"documentmodel.h" "6" -"documentmodel_p.h" "6" -"editorarea.cpp" "6" -"editorarea.h" "6" -"editormanager.cpp" "6" -"editormanager.h" "6" -"editormanager_p.h" "6" -"editorview.cpp" "6" -"editorview.h" "6" -"editorwindow.cpp" "6" -"editorwindow.h" "6" -"ieditor.cpp" "6" -"ieditor.h" "6" -"ieditorfactory.cpp" "6" -"ieditorfactory.h" "6" -"iexternaleditor.cpp" "6" -"iexternaleditor.h" "6" -"openeditorsview.cpp" "6" -"openeditorsview.h" "6" -"openeditorswindow.cpp" "6" -"openeditorswindow.h" "6" -"systemeditor.cpp" "6" -"systemeditor.h" "6" +"documentmodel.cpp" "5" +"documentmodel.h" "5" +"documentmodel_p.h" "5" +"editorarea.cpp" "5" +"editorarea.h" "5" +"editormanager.cpp" "5" +"editormanager.h" "5" +"editormanager_p.h" "5" +"editorview.cpp" "5" +"editorview.h" "5" +"editorwindow.cpp" "5" +"editorwindow.h" "5" +"ieditor.cpp" "5" +"ieditor.h" "5" +"ieditorfactory.cpp" "5" +"ieditorfactory.h" "5" +"iexternaleditor.cpp" "5" +"iexternaleditor.h" "5" +"openeditorsview.cpp" "5" +"openeditorsview.h" "5" +"openeditorswindow.cpp" "5" +"openeditorswindow.h" "5" +"systemeditor.cpp" "5" +"systemeditor.h" "5" "Find" "4" "coreplugin.qbs:289" "5" -"find" "5" -"basetextfind.cpp" "6" -"basetextfind.h" "6" -"currentdocumentfind.cpp" "6" -"currentdocumentfind.h" "6" -"find.qrc" "6" -"/find" "7" -"images" "8" -"casesensitively.png" "9" -"casesensitively@2x.png" "9" -"expand.png" "9" -"expand@2x.png" "9" -"preservecase.png" "9" -"preservecase@2x.png" "9" -"regexp.png" "9" -"regexp@2x.png" "9" -"wholewords.png" "9" -"wholewords@2x.png" "9" -"wrapindicator.png" "9" -"wrapindicator@2x.png" "9" -"finddialog.ui" "6" -"findplugin.cpp" "6" -"findplugin.h" "6" -"findtoolbar.cpp" "6" -"findtoolbar.h" "6" -"findtoolwindow.cpp" "6" -"findtoolwindow.h" "6" -"findwidget.ui" "6" -"highlightscrollbarcontroller.cpp" "6" -"highlightscrollbarcontroller.h" "6" -"ifindfilter.cpp" "6" -"ifindfilter.h" "6" -"ifindsupport.cpp" "6" -"ifindsupport.h" "6" -"itemviewfind.cpp" "6" -"itemviewfind.h" "6" -"searchresultcolor.h" "6" -"searchresulttreeitemdelegate.cpp" "6" -"searchresulttreeitemdelegate.h" "6" -"searchresulttreeitemroles.h" "6" -"searchresulttreeitems.cpp" "6" -"searchresulttreeitems.h" "6" -"searchresulttreemodel.cpp" "6" -"searchresulttreemodel.h" "6" -"searchresulttreeview.cpp" "6" -"searchresulttreeview.h" "6" -"searchresultwidget.cpp" "6" -"searchresultwidget.h" "6" -"searchresultwindow.cpp" "6" -"searchresultwindow.h" "6" -"textfindconstants.h" "6" +"basetextfind.cpp" "5" +"basetextfind.h" "5" +"currentdocumentfind.cpp" "5" +"currentdocumentfind.h" "5" +"find.qrc" "5" +"/find" "6" +"images" "7" +"casesensitively.png" "8" +"casesensitively@2x.png" "8" +"expand.png" "8" +"expand@2x.png" "8" +"preservecase.png" "8" +"preservecase@2x.png" "8" +"regexp.png" "8" +"regexp@2x.png" "8" +"wholewords.png" "8" +"wholewords@2x.png" "8" +"wrapindicator.png" "8" +"wrapindicator@2x.png" "8" +"finddialog.ui" "5" +"findplugin.cpp" "5" +"findplugin.h" "5" +"findtoolbar.cpp" "5" +"findtoolbar.h" "5" +"findtoolwindow.cpp" "5" +"findtoolwindow.h" "5" +"findwidget.ui" "5" +"highlightscrollbarcontroller.cpp" "5" +"highlightscrollbarcontroller.h" "5" +"ifindfilter.cpp" "5" +"ifindfilter.h" "5" +"ifindsupport.cpp" "5" +"ifindsupport.h" "5" +"itemviewfind.cpp" "5" +"itemviewfind.h" "5" +"searchresultcolor.h" "5" +"searchresulttreeitemdelegate.cpp" "5" +"searchresulttreeitemdelegate.h" "5" +"searchresulttreeitemroles.h" "5" +"searchresulttreeitems.cpp" "5" +"searchresulttreeitems.h" "5" +"searchresulttreemodel.cpp" "5" +"searchresulttreemodel.h" "5" +"searchresulttreeview.cpp" "5" +"searchresulttreeview.h" "5" +"searchresultwidget.cpp" "5" +"searchresultwidget.h" "5" +"searchresultwindow.cpp" "5" +"searchresultwindow.h" "5" +"textfindconstants.h" "5" "General" "4" "coreplugin.qbs:39" "5" "basefilewizard.cpp" "5" @@ -6526,44 +6564,42 @@ "windowsupport.h" "5" "Locator" "4" "coreplugin.qbs:332" "5" -"locator" "5" -"basefilefilter.cpp" "6" -"basefilefilter.h" "6" -"commandlocator.cpp" "6" -"commandlocator.h" "6" -"directoryfilter.cpp" "6" -"directoryfilter.h" "6" -"directoryfilter.ui" "6" -"executefilter.cpp" "6" -"executefilter.h" "6" -"externaltoolsfilter.cpp" "6" -"externaltoolsfilter.h" "6" -"filesystemfilter.cpp" "6" -"filesystemfilter.h" "6" -"filesystemfilter.ui" "6" -"ilocatorfilter.cpp" "6" -"ilocatorfilter.h" "6" -"locator.cpp" "6" -"locator.h" "6" -"locatorconstants.h" "6" -"locatorfiltersfilter.cpp" "6" -"locatorfiltersfilter.h" "6" -"locatormanager.cpp" "6" -"locatormanager.h" "6" -"locatorsearchutils.cpp" "6" -"locatorsearchutils.h" "6" -"locatorsettingspage.cpp" "6" -"locatorsettingspage.h" "6" -"locatorsettingspage.ui" "6" -"locatorwidget.cpp" "6" -"locatorwidget.h" "6" -"opendocumentsfilter.cpp" "6" -"opendocumentsfilter.h" "6" +"basefilefilter.cpp" "5" +"basefilefilter.h" "5" +"commandlocator.cpp" "5" +"commandlocator.h" "5" +"directoryfilter.cpp" "5" +"directoryfilter.h" "5" +"directoryfilter.ui" "5" +"executefilter.cpp" "5" +"executefilter.h" "5" +"externaltoolsfilter.cpp" "5" +"externaltoolsfilter.h" "5" +"filesystemfilter.cpp" "5" +"filesystemfilter.h" "5" +"filesystemfilter.ui" "5" +"ilocatorfilter.cpp" "5" +"ilocatorfilter.h" "5" +"locator.cpp" "5" +"locator.h" "5" +"locatorconstants.h" "5" +"locatorfiltersfilter.cpp" "5" +"locatorfiltersfilter.h" "5" +"locatormanager.cpp" "5" +"locatormanager.h" "5" +"locatorsearchutils.cpp" "5" +"locatorsearchutils.h" "5" +"locatorsettingspage.cpp" "5" +"locatorsettingspage.h" "5" +"locatorsettingspage.ui" "5" +"locatorwidget.cpp" "5" +"locatorwidget.h" "5" +"opendocumentsfilter.cpp" "5" +"opendocumentsfilter.h" "5" "Locator Javascript Filter" "4" "coreplugin.qbs:371" "5" -"locator" "5" -"javascriptfilter.cpp" "6" -"javascriptfilter.h" "6" +"javascriptfilter.cpp" "5" +"javascriptfilter.h" "5" "Locator_mac" "4" "coreplugin.qbs:381" "5" "locator" "5" @@ -6571,19 +6607,18 @@ "spotlightlocatorfilter.mm" "6" "PluginMetaData" "4" "QtcPlugin.qbs:49" "5" -"Core.json.in" "6" +"Core.json.in" "5" "Progress Manager" "4" "coreplugin.qbs:240" "5" -"progressmanager" "5" -"futureprogress.cpp" "6" -"futureprogress.h" "6" -"progressbar.cpp" "6" -"progressbar.h" "6" -"progressmanager.cpp" "6" -"progressmanager.h" "6" -"progressmanager_p.h" "6" -"progressview.cpp" "6" -"progressview.h" "6" +"futureprogress.cpp" "5" +"futureprogress.h" "5" +"progressbar.cpp" "5" +"progressbar.h" "5" +"progressmanager.cpp" "5" +"progressmanager.h" "5" +"progressmanager_p.h" "5" +"progressview.cpp" "5" +"progressview.h" "5" "ProgressManager_mac" "4" "coreplugin.qbs:259" "5" "progressmanager" "5" @@ -6614,160 +6649,160 @@ "coreplugin.qbs:7" "4" "Group 1" "4" "QtcDevHeaders.qbs:10" "5" -"actionmanager" "6" -"actioncontainer.h" "7" -"actioncontainer_p.h" "7" -"actionmanager.h" "7" -"actionmanager_p.h" "7" -"command.h" "7" -"command_p.h" "7" -"commandbutton.h" "7" -"commandmappings.h" "7" -"commandsfile.h" "7" -"dialogs" "6" -"addtovcsdialog.h" "7" -"externaltoolconfig.h" "7" -"filepropertiesdialog.h" "7" -"ioptionspage.h" "7" -"newdialog.h" "7" -"openwithdialog.h" "7" -"promptoverwritedialog.h" "7" -"readonlyfilesdialog.h" "7" -"saveitemsdialog.h" "7" -"settingsdialog.h" "7" -"shortcutsettings.h" "7" -"editormanager" "6" -"documentmodel.h" "7" -"documentmodel_p.h" "7" -"editorarea.h" "7" -"editormanager.h" "7" -"editormanager_p.h" "7" -"editorview.h" "7" -"editorwindow.h" "7" -"ieditor.h" "7" -"ieditorfactory.h" "7" -"iexternaleditor.h" "7" -"openeditorsview.h" "7" -"openeditorswindow.h" "7" -"systemeditor.h" "7" -"find" "6" -"basetextfind.h" "7" -"currentdocumentfind.h" "7" -"findplugin.h" "7" -"findtoolbar.h" "7" -"findtoolwindow.h" "7" -"highlightscrollbarcontroller.h" "7" -"ifindfilter.h" "7" -"ifindsupport.h" "7" -"itemviewfind.h" "7" -"searchresultcolor.h" "7" -"searchresultitem.h" "7" -"searchresulttreeitemdelegate.h" "7" -"searchresulttreeitemroles.h" "7" -"searchresulttreeitems.h" "7" -"searchresulttreemodel.h" "7" -"searchresulttreeview.h" "7" -"searchresultwidget.h" "7" -"searchresultwindow.h" "7" -"textfindconstants.h" "7" -"locator" "6" -"basefilefilter.h" "7" -"commandlocator.h" "7" -"directoryfilter.h" "7" -"executefilter.h" "7" -"externaltoolsfilter.h" "7" -"filesystemfilter.h" "7" -"ilocatorfilter.h" "7" -"javascriptfilter.h" "7" -"locator.h" "7" -"locatorconstants.h" "7" -"locatorfiltersfilter.h" "7" -"locatorfiltertest.h" "7" -"locatormanager.h" "7" -"locatorsearchutils.h" "7" -"locatorsettingspage.h" "7" -"locatorwidget.h" "7" -"opendocumentsfilter.h" "7" -"spotlightlocatorfilter.h" "7" -"progressmanager" "6" -"futureprogress.h" "7" -"progressbar.h" "7" -"progressmanager.h" "7" -"progressmanager_p.h" "7" -"progressview.h" "7" -"basefilewizard.h" "6" -"basefilewizardfactory.h" "6" -"core_global.h" "6" -"coreconstants.h" "6" -"coreicons.h" "6" -"corejsextensions.h" "6" -"coreplugin.h" "6" -"designmode.h" "6" -"diffservice.h" "6" -"documentmanager.h" "6" -"editmode.h" "6" -"editortoolbar.h" "6" -"externaltool.h" "6" -"externaltoolmanager.h" "6" -"fancyactionbar.h" "6" -"fancytabwidget.h" "6" -"featureprovider.h" "6" -"fileiconprovider.h" "6" -"fileutils.h" "6" -"findplaceholder.h" "6" -"generalsettings.h" "6" -"generatedfile.h" "6" -"helpmanager.h" "6" -"icontext.h" "6" -"icore.h" "6" -"id.h" "6" -"idocument.h" "6" -"idocumentfactory.h" "6" -"ifilewizardextension.h" "6" -"imode.h" "6" -"inavigationwidgetfactory.h" "6" -"infobar.h" "6" -"ioutputpane.h" "6" -"iversioncontrol.h" "6" -"iwelcomepage.h" "6" -"iwizardfactory.h" "6" -"jsexpander.h" "6" -"mainwindow.h" "6" -"manhattanstyle.h" "6" -"menubarfilter.h" "6" -"messagebox.h" "6" -"messagemanager.h" "6" -"messageoutputwindow.h" "6" -"mimetypemagicdialog.h" "6" -"mimetypesettings.h" "6" -"minisplitter.h" "6" -"modemanager.h" "6" -"navigationsubwidget.h" "6" -"navigationwidget.h" "6" -"opendocumentstreeview.h" "6" -"outputpane.h" "6" -"outputpanemanager.h" "6" -"outputwindow.h" "6" -"patchtool.h" "6" -"plugindialog.h" "6" -"reaper.h" "6" -"reaper_p.h" "6" -"rightpane.h" "6" -"settingsdatabase.h" "6" -"shellcommand.h" "6" -"sidebar.h" "6" -"sidebarwidget.h" "6" -"statusbarmanager.h" "6" -"styleanimator.h" "6" -"systemsettings.h" "6" -"testdatadir.h" "6" -"textdocument.h" "6" -"themechooser.h" "6" -"toolsettings.h" "6" -"variablechooser.h" "6" -"vcsmanager.h" "6" -"versiondialog.h" "6" -"windowsupport.h" "6" +"actionmanager" "5" +"actioncontainer.h" "6" +"actioncontainer_p.h" "6" +"actionmanager.h" "6" +"actionmanager_p.h" "6" +"command.h" "6" +"command_p.h" "6" +"commandbutton.h" "6" +"commandmappings.h" "6" +"commandsfile.h" "6" +"dialogs" "5" +"addtovcsdialog.h" "6" +"externaltoolconfig.h" "6" +"filepropertiesdialog.h" "6" +"ioptionspage.h" "6" +"newdialog.h" "6" +"openwithdialog.h" "6" +"promptoverwritedialog.h" "6" +"readonlyfilesdialog.h" "6" +"saveitemsdialog.h" "6" +"settingsdialog.h" "6" +"shortcutsettings.h" "6" +"editormanager" "5" +"documentmodel.h" "6" +"documentmodel_p.h" "6" +"editorarea.h" "6" +"editormanager.h" "6" +"editormanager_p.h" "6" +"editorview.h" "6" +"editorwindow.h" "6" +"ieditor.h" "6" +"ieditorfactory.h" "6" +"iexternaleditor.h" "6" +"openeditorsview.h" "6" +"openeditorswindow.h" "6" +"systemeditor.h" "6" +"find" "5" +"basetextfind.h" "6" +"currentdocumentfind.h" "6" +"findplugin.h" "6" +"findtoolbar.h" "6" +"findtoolwindow.h" "6" +"highlightscrollbarcontroller.h" "6" +"ifindfilter.h" "6" +"ifindsupport.h" "6" +"itemviewfind.h" "6" +"searchresultcolor.h" "6" +"searchresultitem.h" "6" +"searchresulttreeitemdelegate.h" "6" +"searchresulttreeitemroles.h" "6" +"searchresulttreeitems.h" "6" +"searchresulttreemodel.h" "6" +"searchresulttreeview.h" "6" +"searchresultwidget.h" "6" +"searchresultwindow.h" "6" +"textfindconstants.h" "6" +"locator" "5" +"basefilefilter.h" "6" +"commandlocator.h" "6" +"directoryfilter.h" "6" +"executefilter.h" "6" +"externaltoolsfilter.h" "6" +"filesystemfilter.h" "6" +"ilocatorfilter.h" "6" +"javascriptfilter.h" "6" +"locator.h" "6" +"locatorconstants.h" "6" +"locatorfiltersfilter.h" "6" +"locatorfiltertest.h" "6" +"locatormanager.h" "6" +"locatorsearchutils.h" "6" +"locatorsettingspage.h" "6" +"locatorwidget.h" "6" +"opendocumentsfilter.h" "6" +"spotlightlocatorfilter.h" "6" +"progressmanager" "5" +"futureprogress.h" "6" +"progressbar.h" "6" +"progressmanager.h" "6" +"progressmanager_p.h" "6" +"progressview.h" "6" +"basefilewizard.h" "5" +"basefilewizardfactory.h" "5" +"core_global.h" "5" +"coreconstants.h" "5" +"coreicons.h" "5" +"corejsextensions.h" "5" +"coreplugin.h" "5" +"designmode.h" "5" +"diffservice.h" "5" +"documentmanager.h" "5" +"editmode.h" "5" +"editortoolbar.h" "5" +"externaltool.h" "5" +"externaltoolmanager.h" "5" +"fancyactionbar.h" "5" +"fancytabwidget.h" "5" +"featureprovider.h" "5" +"fileiconprovider.h" "5" +"fileutils.h" "5" +"findplaceholder.h" "5" +"generalsettings.h" "5" +"generatedfile.h" "5" +"helpmanager.h" "5" +"icontext.h" "5" +"icore.h" "5" +"id.h" "5" +"idocument.h" "5" +"idocumentfactory.h" "5" +"ifilewizardextension.h" "5" +"imode.h" "5" +"inavigationwidgetfactory.h" "5" +"infobar.h" "5" +"ioutputpane.h" "5" +"iversioncontrol.h" "5" +"iwelcomepage.h" "5" +"iwizardfactory.h" "5" +"jsexpander.h" "5" +"mainwindow.h" "5" +"manhattanstyle.h" "5" +"menubarfilter.h" "5" +"messagebox.h" "5" +"messagemanager.h" "5" +"messageoutputwindow.h" "5" +"mimetypemagicdialog.h" "5" +"mimetypesettings.h" "5" +"minisplitter.h" "5" +"modemanager.h" "5" +"navigationsubwidget.h" "5" +"navigationwidget.h" "5" +"opendocumentstreeview.h" "5" +"outputpane.h" "5" +"outputpanemanager.h" "5" +"outputwindow.h" "5" +"patchtool.h" "5" +"plugindialog.h" "5" +"reaper.h" "5" +"reaper_p.h" "5" +"rightpane.h" "5" +"settingsdatabase.h" "5" +"shellcommand.h" "5" +"sidebar.h" "5" +"sidebarwidget.h" "5" +"statusbarmanager.h" "5" +"styleanimator.h" "5" +"systemsettings.h" "5" +"testdatadir.h" "5" +"textdocument.h" "5" +"themechooser.h" "5" +"toolsettings.h" "5" +"variablechooser.h" "5" +"vcsmanager.h" "5" +"versiondialog.h" "5" +"windowsupport.h" "5" "cpaster" "2" "frontend.qbs:3" "3" "Frontend Sources" "3" @@ -6798,7 +6833,7 @@ "cppeditor.qbs:4" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"CppEditor.json.in" "5" +"CppEditor.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -6881,7 +6916,7 @@ "cpptools.qbs:9" "4" "PluginMetaData" "4" "QtcPlugin.qbs:49" "5" -"CppTools.json.in" "6" +"CppTools.json.in" "5" "standard pch file (gui)" "4" "QtcProduct.qbs:65" "5" "qtcreator_gui_pch.h" "6" @@ -7103,113 +7138,113 @@ "cpptools.qbs:7" "4" "Group 1" "4" "QtcDevHeaders.qbs:10" "5" -"abstracteditorsupport.h" "6" -"abstractoverviewmodel.h" "6" -"baseeditordocumentparser.h" "6" -"baseeditordocumentprocessor.h" "6" -"builtincursorinfo.h" "6" -"builtineditordocumentparser.h" "6" -"builtineditordocumentprocessor.h" "6" -"builtinindexingsupport.h" "6" -"clangdiagnosticconfig.h" "6" -"clangdiagnosticconfigsmodel.h" "6" -"clangdiagnosticconfigsselectionwidget.h" "6" -"clangdiagnosticconfigswidget.h" "6" -"compileroptionsbuilder.h" "6" -"cppcanonicalsymbol.h" "6" -"cppchecksymbols.h" "6" -"cppclassesfilter.h" "6" -"cppcodeformatter.h" "6" -"cppcodemodelinspectordumper.h" "6" -"cppcodemodelsettings.h" "6" -"cppcodemodelsettingspage.h" "6" -"cppcodestylepreferences.h" "6" -"cppcodestylepreferencesfactory.h" "6" -"cppcodestylesettings.h" "6" -"cppcodestylesettingspage.h" "6" -"cppcompletionassist.h" "6" -"cppcompletionassistprocessor.h" "6" -"cppcompletionassistprovider.h" "6" -"cppcurrentdocumentfilter.h" "6" -"cppcursorinfo.h" "6" -"cppdoxygen.h" "6" -"cppeditoroutline.h" "6" -"cppeditorwidgetinterface.h" "6" -"cppelementevaluator.h" "6" -"cppfileiterationorder.h" "6" -"cppfilesettingspage.h" "6" -"cppfindreferences.h" "6" -"cppfollowsymbolundercursor.h" "6" -"cppfunctionsfilter.h" "6" -"cpphoverhandler.h" "6" -"cppincludesfilter.h" "6" -"cppindexingsupport.h" "6" -"cpplocalsymbols.h" "6" -"cpplocatordata.h" "6" -"cpplocatorfilter.h" "6" -"cppmodelmanager.h" "6" -"cppmodelmanagersupport.h" "6" -"cppmodelmanagersupportinternal.h" "6" -"cppoverviewmodel.h" "6" -"cpppointerdeclarationformatter.h" "6" -"cppprojectfile.h" "6" -"cppprojectfilecategorizer.h" "6" -"cppprojectinfogenerator.h" "6" -"cppprojectpartchooser.h" "6" -"cppprojectupdater.h" "6" -"cppqtstyleindenter.h" "6" -"cpprawprojectpart.h" "6" -"cpprefactoringchanges.h" "6" -"cpprefactoringengine.h" "6" -"cppselectionchanger.h" "6" -"cppsemanticinfo.h" "6" -"cppsemanticinfoupdater.h" "6" -"cppsourceprocessertesthelper.h" "6" -"cppsourceprocessor.h" "6" -"cppsymbolinfo.h" "6" -"cpptools_clangtidychecks.h" "6" -"cpptools_global.h" "6" -"cpptools_utils.h" "6" -"cpptoolsbridge.h" "6" -"cpptoolsbridgeinterface.h" "6" -"cpptoolsbridgeqtcreatorimplementation.h" "6" -"cpptoolsconstants.h" "6" -"cpptoolsjsextension.h" "6" -"cpptoolsplugin.h" "6" -"cpptoolsreuse.h" "6" -"cpptoolssettings.h" "6" -"cpptoolstestcase.h" "6" -"cppvirtualfunctionassistprovider.h" "6" -"cppvirtualfunctionproposalitem.h" "6" -"cppworkingcopy.h" "6" -"cursorineditor.h" "6" -"doxygengenerator.h" "6" -"editordocumenthandle.h" "6" -"followsymbolinterface.h" "6" -"functionutils.h" "6" -"generatedcodemodelsupport.h" "6" -"includeutils.h" "6" -"indexitem.h" "6" -"insertionpointlocator.h" "6" -"modelmanagertesthelper.h" "6" -"projectinfo.h" "6" -"projectpart.h" "6" -"projectpartheaderpath.h" "6" -"refactoringengineinterface.h" "6" -"searchsymbols.h" "6" -"semantichighlighter.h" "6" -"senddocumenttracker.h" "6" -"stringtable.h" "6" -"symbolfinder.h" "6" -"symbolsfindfilter.h" "6" -"typehierarchybuilder.h" "6" -"usages.h" "6" -"wrappablelineedit.h" "6" +"abstracteditorsupport.h" "5" +"abstractoverviewmodel.h" "5" +"baseeditordocumentparser.h" "5" +"baseeditordocumentprocessor.h" "5" +"builtincursorinfo.h" "5" +"builtineditordocumentparser.h" "5" +"builtineditordocumentprocessor.h" "5" +"builtinindexingsupport.h" "5" +"clangdiagnosticconfig.h" "5" +"clangdiagnosticconfigsmodel.h" "5" +"clangdiagnosticconfigsselectionwidget.h" "5" +"clangdiagnosticconfigswidget.h" "5" +"compileroptionsbuilder.h" "5" +"cppcanonicalsymbol.h" "5" +"cppchecksymbols.h" "5" +"cppclassesfilter.h" "5" +"cppcodeformatter.h" "5" +"cppcodemodelinspectordumper.h" "5" +"cppcodemodelsettings.h" "5" +"cppcodemodelsettingspage.h" "5" +"cppcodestylepreferences.h" "5" +"cppcodestylepreferencesfactory.h" "5" +"cppcodestylesettings.h" "5" +"cppcodestylesettingspage.h" "5" +"cppcompletionassist.h" "5" +"cppcompletionassistprocessor.h" "5" +"cppcompletionassistprovider.h" "5" +"cppcurrentdocumentfilter.h" "5" +"cppcursorinfo.h" "5" +"cppdoxygen.h" "5" +"cppeditoroutline.h" "5" +"cppeditorwidgetinterface.h" "5" +"cppelementevaluator.h" "5" +"cppfileiterationorder.h" "5" +"cppfilesettingspage.h" "5" +"cppfindreferences.h" "5" +"cppfollowsymbolundercursor.h" "5" +"cppfunctionsfilter.h" "5" +"cpphoverhandler.h" "5" +"cppincludesfilter.h" "5" +"cppindexingsupport.h" "5" +"cpplocalsymbols.h" "5" +"cpplocatordata.h" "5" +"cpplocatorfilter.h" "5" +"cppmodelmanager.h" "5" +"cppmodelmanagersupport.h" "5" +"cppmodelmanagersupportinternal.h" "5" +"cppoverviewmodel.h" "5" +"cpppointerdeclarationformatter.h" "5" +"cppprojectfile.h" "5" +"cppprojectfilecategorizer.h" "5" +"cppprojectinfogenerator.h" "5" +"cppprojectpartchooser.h" "5" +"cppprojectupdater.h" "5" +"cppqtstyleindenter.h" "5" +"cpprawprojectpart.h" "5" +"cpprefactoringchanges.h" "5" +"cpprefactoringengine.h" "5" +"cppselectionchanger.h" "5" +"cppsemanticinfo.h" "5" +"cppsemanticinfoupdater.h" "5" +"cppsourceprocessertesthelper.h" "5" +"cppsourceprocessor.h" "5" +"cppsymbolinfo.h" "5" +"cpptools_clangtidychecks.h" "5" +"cpptools_global.h" "5" +"cpptools_utils.h" "5" +"cpptoolsbridge.h" "5" +"cpptoolsbridgeinterface.h" "5" +"cpptoolsbridgeqtcreatorimplementation.h" "5" +"cpptoolsconstants.h" "5" +"cpptoolsjsextension.h" "5" +"cpptoolsplugin.h" "5" +"cpptoolsreuse.h" "5" +"cpptoolssettings.h" "5" +"cpptoolstestcase.h" "5" +"cppvirtualfunctionassistprovider.h" "5" +"cppvirtualfunctionproposalitem.h" "5" +"cppworkingcopy.h" "5" +"cursorineditor.h" "5" +"doxygengenerator.h" "5" +"editordocumenthandle.h" "5" +"followsymbolinterface.h" "5" +"functionutils.h" "5" +"generatedcodemodelsupport.h" "5" +"includeutils.h" "5" +"indexitem.h" "5" +"insertionpointlocator.h" "5" +"modelmanagertesthelper.h" "5" +"projectinfo.h" "5" +"projectpart.h" "5" +"projectpartheaderpath.h" "5" +"refactoringengineinterface.h" "5" +"searchsymbols.h" "5" +"semantichighlighter.h" "5" +"senddocumenttracker.h" "5" +"stringtable.h" "5" +"symbolfinder.h" "5" +"symbolsfindfilter.h" "5" +"typehierarchybuilder.h" "5" +"usages.h" "5" +"wrappablelineedit.h" "5" "CVS" "2" "cvs.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"CVS.json.in" "5" +"CVS.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -7241,60 +7276,56 @@ "debugger.qbs:8" "4" "Analyzer" "4" "debugger.qbs:227" "5" -"analyzer" "5" -"analyzerbase.qrc" "6" -"/" "7" -"images" "8" -"settingscategory_analyzer.png" "9" -"settingscategory_analyzer@2x.png" "9" -"analyzerconstants.h" "6" -"analyzericons.h" "6" -"analyzermanager.h" "6" -"analyzerrunconfigwidget.cpp" "6" -"analyzerrunconfigwidget.h" "6" -"analyzerutils.cpp" "6" -"analyzerutils.h" "6" -"detailederrorview.cpp" "6" -"detailederrorview.h" "6" -"diagnosticlocation.cpp" "6" -"diagnosticlocation.h" "6" -"startremotedialog.cpp" "6" -"startremotedialog.h" "6" +"analyzerbase.qrc" "5" +"/" "6" +"images" "7" +"settingscategory_analyzer.png" "8" +"settingscategory_analyzer@2x.png" "8" +"analyzerconstants.h" "5" +"analyzericons.h" "5" +"analyzermanager.h" "5" +"analyzerrunconfigwidget.cpp" "5" +"analyzerrunconfigwidget.h" "5" +"analyzerutils.cpp" "5" +"analyzerutils.h" "5" +"detailederrorview.cpp" "5" +"detailederrorview.h" "5" +"diagnosticlocation.cpp" "5" +"diagnosticlocation.h" "5" +"startremotedialog.cpp" "5" +"startremotedialog.h" "5" "cdb" "4" "debugger.qbs:95" "5" -"cdb" "5" -"cdbengine.cpp" "6" -"cdbengine.h" "6" -"cdboptionspage.cpp" "6" -"cdboptionspage.h" "6" -"cdboptionspagewidget.ui" "6" -"cdbparsehelpers.cpp" "6" -"cdbparsehelpers.h" "6" -"stringinputstream.cpp" "6" -"stringinputstream.h" "6" +"cdbengine.cpp" "5" +"cdbengine.h" "5" +"cdboptionspage.cpp" "5" +"cdboptionspage.h" "5" +"cdboptionspagewidget.ui" "5" +"cdbparsehelpers.cpp" "5" +"cdbparsehelpers.h" "5" +"stringinputstream.cpp" "5" +"stringinputstream.h" "5" "Debugger Console" "4" "debugger.qbs:154" "5" -"console" "5" -"console.cpp" "6" -"console.h" "6" -"consoleedit.cpp" "6" -"consoleedit.h" "6" -"consoleitem.cpp" "6" -"consoleitem.h" "6" -"consoleitemdelegate.cpp" "6" -"consoleitemdelegate.h" "6" -"consoleitemmodel.cpp" "6" -"consoleitemmodel.h" "6" -"consoleproxymodel.cpp" "6" -"consoleproxymodel.h" "6" -"consoleview.cpp" "6" -"consoleview.h" "6" +"console.cpp" "5" +"console.h" "5" +"consoleedit.cpp" "5" +"consoleedit.h" "5" +"consoleitem.cpp" "5" +"consoleitem.h" "5" +"consoleitemdelegate.cpp" "5" +"consoleitemdelegate.h" "5" +"consoleitemmodel.cpp" "5" +"consoleitemmodel.h" "5" +"consoleproxymodel.cpp" "5" +"consoleproxymodel.h" "5" +"consoleview.cpp" "5" +"consoleview.h" "5" "gdb" "4" "debugger.qbs:107" "5" -"gdb" "5" -"gdbengine.cpp" "6" -"gdbengine.h" "6" -"gdboptionspage.cpp" "6" +"gdbengine.cpp" "5" +"gdbengine.h" "5" +"gdboptionspage.cpp" "5" "General" "4" "debugger.qbs:37" "5" "breakhandler.cpp" "5" @@ -7446,120 +7477,114 @@ "watchwindow.h" "5" "Images" "4" "debugger.qbs:181" "5" -"images" "5" -"breakpoint_disabled.png" "6" -"breakpoint_disabled@2x.png" "6" -"breakpoint_pending_overlay.png" "6" -"breakpoint_pending_overlay@2x.png" "6" -"debugger_breakpoints.png" "6" -"debugger_continue.png" "6" -"debugger_continue@2x.png" "6" -"debugger_continue_1_mask.png" "6" -"debugger_continue_1_mask@2x.png" "6" -"debugger_continue_2_mask.png" "6" -"debugger_continue_2_mask@2x.png" "6" -"debugger_empty_14.png" "6" -"debugger_interrupt.png" "6" -"debugger_interrupt@2x.png" "6" -"debugger_interrupt_mask.png" "6" -"debugger_interrupt_mask@2x.png" "6" -"debugger_restart_small.png" "6" -"debugger_restart_small@2x.png" "6" -"debugger_reversemode.png" "6" -"debugger_reversemode@2x.png" "6" -"debugger_reversemode_background.png" "6" -"debugger_reversemode_background@2x.png" "6" -"debugger_singleinstructionmode.png" "6" -"debugger_singleinstructionmode@2x.png" "6" -"debugger_stepinto_small.png" "6" -"debugger_stepinto_small@2x.png" "6" -"debugger_stepout_small.png" "6" -"debugger_stepout_small@2x.png" "6" -"debugger_stepover_small.png" "6" -"debugger_stepover_small@2x.png" "6" -"debugger_stop_32.png" "6" -"location.png" "6" -"location@2x.png" "6" -"location_background.png" "6" -"location_background@2x.png" "6" -"mode_debug.png" "6" -"mode_debug@2x.png" "6" -"mode_debug_mask.png" "6" -"mode_debug_mask@2x.png" "6" -"pin.xpm" "6" -"recordfill.png" "6" -"recordfill@2x.png" "6" -"recordoutline.png" "6" -"recordoutline@2x.png" "6" -"settingscategory_debugger.png" "6" -"settingscategory_debugger@2x.png" "6" -"tracepointoverlay.png" "6" -"tracepointoverlay@2x.png" "6" +"breakpoint_disabled.png" "5" +"breakpoint_disabled@2x.png" "5" +"breakpoint_pending_overlay.png" "5" +"breakpoint_pending_overlay@2x.png" "5" +"debugger_breakpoints.png" "5" +"debugger_continue.png" "5" +"debugger_continue@2x.png" "5" +"debugger_continue_1_mask.png" "5" +"debugger_continue_1_mask@2x.png" "5" +"debugger_continue_2_mask.png" "5" +"debugger_continue_2_mask@2x.png" "5" +"debugger_empty_14.png" "5" +"debugger_interrupt.png" "5" +"debugger_interrupt@2x.png" "5" +"debugger_interrupt_mask.png" "5" +"debugger_interrupt_mask@2x.png" "5" +"debugger_restart_small.png" "5" +"debugger_restart_small@2x.png" "5" +"debugger_reversemode.png" "5" +"debugger_reversemode@2x.png" "5" +"debugger_reversemode_background.png" "5" +"debugger_reversemode_background@2x.png" "5" +"debugger_singleinstructionmode.png" "5" +"debugger_singleinstructionmode@2x.png" "5" +"debugger_stepinto_small.png" "5" +"debugger_stepinto_small@2x.png" "5" +"debugger_stepout_small.png" "5" +"debugger_stepout_small@2x.png" "5" +"debugger_stepover_small.png" "5" +"debugger_stepover_small@2x.png" "5" +"debugger_stop_32.png" "5" +"location.png" "5" +"location@2x.png" "5" +"location_background.png" "5" +"location_background@2x.png" "5" +"mode_debug.png" "5" +"mode_debug@2x.png" "5" +"mode_debug_mask.png" "5" +"mode_debug_mask@2x.png" "5" +"pin.xpm" "5" +"recordfill.png" "5" +"recordfill@2x.png" "5" +"recordoutline.png" "5" +"recordoutline@2x.png" "5" +"settingscategory_debugger.png" "5" +"settingscategory_debugger@2x.png" "5" +"tracepointoverlay.png" "5" +"tracepointoverlay@2x.png" "5" "Images/analyzer" "4" "debugger.qbs:193" "5" -"settingscategory_analyzer.png" "6" -"settingscategory_analyzer@2x.png" "6" +"settingscategory_analyzer.png" "5" +"settingscategory_analyzer@2x.png" "5" "Images/qml" "4" "debugger.qbs:187" "5" "lldb" "4" "debugger.qbs:116" "5" -"lldb" "5" -"lldbengine.cpp" "6" -"lldbengine.h" "6" +"lldbengine.cpp" "5" +"lldbengine.h" "5" "Name Demangler" "4" "debugger.qbs:130" "5" -"namedemangler" "5" -"demanglerexceptions.h" "6" -"globalparsestate.cpp" "6" -"globalparsestate.h" "6" -"namedemangler.cpp" "6" -"namedemangler.h" "6" -"parsetreenodes.cpp" "6" -"parsetreenodes.h" "6" +"demanglerexceptions.h" "5" +"globalparsestate.cpp" "5" +"globalparsestate.h" "5" +"namedemangler.cpp" "5" +"namedemangler.h" "5" +"parsetreenodes.cpp" "5" +"parsetreenodes.h" "5" "pdb" "4" "debugger.qbs:124" "5" -"pdb" "5" -"pdbengine.cpp" "6" -"pdbengine.h" "6" +"pdbengine.cpp" "5" +"pdbengine.h" "5" "PluginMetaData" "4" "QtcPlugin.qbs:49" "5" -"Debugger.json.in" "6" +"Debugger.json.in" "5" "QML Debugger" "4" "debugger.qbs:141" "5" -"qml" "5" -"interactiveinterpreter.cpp" "6" -"interactiveinterpreter.h" "6" -"qmlcppengine.cpp" "6" -"qmlcppengine.h" "6" -"qmlengine.cpp" "6" -"qmlengine.h" "6" -"qmlengineutils.cpp" "6" -"qmlengineutils.h" "6" -"qmlinspectoragent.cpp" "6" -"qmlinspectoragent.h" "6" -"qmlv8debuggerclientconstants.h" "6" +"interactiveinterpreter.cpp" "5" +"interactiveinterpreter.h" "5" +"qmlcppengine.cpp" "5" +"qmlcppengine.h" "5" +"qmlengine.cpp" "5" +"qmlengine.h" "5" +"qmlengineutils.cpp" "5" +"qmlengineutils.h" "5" +"qmlinspectoragent.cpp" "5" +"qmlinspectoragent.h" "5" +"qmlv8debuggerclientconstants.h" "5" "RegisterPostMortem" "4" "debugger.qbs:209" "5" "registerpostmortemaction.cpp" "5" "registerpostmortemaction.h" "5" "RegistryAccess" "4" "debugger.qbs:199" "5" -"registryaccess.cpp" "6" -"registryaccess.h" "6" +"registryaccess.cpp" "5" +"registryaccess.h" "5" "shared" "4" "debugger.qbs:168" "5" -"shared" "5" -"backtrace.cpp" "6" -"backtrace.h" "6" -"cdbsymbolpathlisteditor.cpp" "6" -"cdbsymbolpathlisteditor.h" "6" -"hostutils.cpp" "6" -"hostutils.h" "6" -"peutils.cpp" "6" -"peutils.h" "6" -"symbolpathsdialog.cpp" "6" -"symbolpathsdialog.h" "6" -"symbolpathsdialog.ui" "6" +"backtrace.cpp" "5" +"backtrace.h" "5" +"cdbsymbolpathlisteditor.cpp" "5" +"cdbsymbolpathlisteditor.h" "5" +"hostutils.cpp" "5" +"hostutils.h" "5" +"peutils.cpp" "5" +"peutils.h" "5" +"symbolpathsdialog.cpp" "5" +"symbolpathsdialog.h" "5" +"symbolpathsdialog.ui" "5" "standard pch file (gui)" "4" "QtcProduct.qbs:65" "5" "qtcreator_gui_pch.h" "6" @@ -7580,118 +7605,117 @@ "debugger.qbs:6" "4" "Group 1" "4" "QtcDevHeaders.qbs:10" "5" -"analyzer" "6" -"analyzerconstants.h" "7" -"analyzericons.h" "7" -"analyzermanager.h" "7" -"analyzerrunconfigwidget.h" "7" -"analyzerutils.h" "7" -"detailederrorview.h" "7" -"diagnosticlocation.h" "7" -"startremotedialog.h" "7" -"cdb" "6" -"cdbengine.h" "7" -"cdboptionspage.h" "7" -"cdbparsehelpers.h" "7" -"stringinputstream.h" "7" -"console" "6" -"console.h" "7" -"consoleedit.h" "7" -"consoleitem.h" "7" -"consoleitemdelegate.h" "7" -"consoleitemmodel.h" "7" -"consoleproxymodel.h" "7" -"consoleview.h" "7" -"gdb" "6" -"gdbengine.h" "7" -"lldb" "6" -"lldbengine.h" "7" -"namedemangler" "6" -"demanglerexceptions.h" "7" -"globalparsestate.h" "7" -"namedemangler.h" "7" -"parsetreenodes.h" "7" -"pdb" "6" -"pdbengine.h" "7" -"qml" "6" -"interactiveinterpreter.h" "7" -"qmlcppengine.h" "7" -"qmlengine.h" "7" -"qmlengineutils.h" "7" -"qmlinspectoragent.h" "7" -"qmlv8debuggerclientconstants.h" "7" -"shared" "6" -"backtrace.h" "7" -"cdbsymbolpathlisteditor.h" "7" -"hostutils.h" "7" -"peutils.h" "7" -"symbolpathsdialog.h" "7" -"breakhandler.h" "6" -"breakpoint.h" "6" -"commonoptionspage.h" "6" -"debugger_global.h" "6" -"debuggeractions.h" "6" -"debuggerconstants.h" "6" -"debuggercore.h" "6" -"debuggerdialogs.h" "6" -"debuggerengine.h" "6" -"debuggericons.h" "6" -"debuggerinternalconstants.h" "6" -"debuggeritem.h" "6" -"debuggeritemmanager.h" "6" -"debuggerkitconfigwidget.h" "6" -"debuggerkitinformation.h" "6" -"debuggermainwindow.h" "6" -"debuggerplugin.h" "6" -"debuggerprotocol.h" "6" -"debuggerrunconfigurationaspect.h" "6" -"debuggerruncontrol.h" "6" -"debuggersourcepathmappingwidget.h" "6" -"debuggertooltipmanager.h" "6" -"disassembleragent.h" "6" -"disassemblerlines.h" "6" -"imageviewer.h" "6" -"loadcoredialog.h" "6" -"localsandexpressionswindow.h" "6" -"logwindow.h" "6" -"memoryagent.h" "6" -"moduleshandler.h" "6" -"outputcollector.h" "6" -"procinterrupt.h" "6" -"registerhandler.h" "6" -"registerpostmortemaction.h" "6" -"simplifytype.h" "6" -"snapshothandler.h" "6" -"snapshotwindow.h" "6" -"sourceagent.h" "6" -"sourcefileshandler.h" "6" -"sourceutils.h" "6" -"stackframe.h" "6" -"stackhandler.h" "6" -"stackwindow.h" "6" -"terminal.h" "6" -"threaddata.h" "6" -"threadshandler.h" "6" -"unstartedappwatcherdialog.h" "6" -"watchdata.h" "6" -"watchdelegatewidgets.h" "6" -"watchhandler.h" "6" -"watchutils.h" "6" -"watchwindow.h" "6" +"analyzer" "5" +"analyzerconstants.h" "6" +"analyzericons.h" "6" +"analyzermanager.h" "6" +"analyzerrunconfigwidget.h" "6" +"analyzerutils.h" "6" +"detailederrorview.h" "6" +"diagnosticlocation.h" "6" +"startremotedialog.h" "6" +"cdb" "5" +"cdbengine.h" "6" +"cdboptionspage.h" "6" +"cdbparsehelpers.h" "6" +"stringinputstream.h" "6" +"console" "5" +"console.h" "6" +"consoleedit.h" "6" +"consoleitem.h" "6" +"consoleitemdelegate.h" "6" +"consoleitemmodel.h" "6" +"consoleproxymodel.h" "6" +"consoleview.h" "6" +"gdb" "5" +"gdbengine.h" "6" +"lldb" "5" +"lldbengine.h" "6" +"namedemangler" "5" +"demanglerexceptions.h" "6" +"globalparsestate.h" "6" +"namedemangler.h" "6" +"parsetreenodes.h" "6" +"pdb" "5" +"pdbengine.h" "6" +"qml" "5" +"interactiveinterpreter.h" "6" +"qmlcppengine.h" "6" +"qmlengine.h" "6" +"qmlengineutils.h" "6" +"qmlinspectoragent.h" "6" +"qmlv8debuggerclientconstants.h" "6" +"shared" "5" +"backtrace.h" "6" +"cdbsymbolpathlisteditor.h" "6" +"hostutils.h" "6" +"peutils.h" "6" +"symbolpathsdialog.h" "6" +"breakhandler.h" "5" +"breakpoint.h" "5" +"commonoptionspage.h" "5" +"debugger_global.h" "5" +"debuggeractions.h" "5" +"debuggerconstants.h" "5" +"debuggercore.h" "5" +"debuggerdialogs.h" "5" +"debuggerengine.h" "5" +"debuggericons.h" "5" +"debuggerinternalconstants.h" "5" +"debuggeritem.h" "5" +"debuggeritemmanager.h" "5" +"debuggerkitconfigwidget.h" "5" +"debuggerkitinformation.h" "5" +"debuggermainwindow.h" "5" +"debuggerplugin.h" "5" +"debuggerprotocol.h" "5" +"debuggerrunconfigurationaspect.h" "5" +"debuggerruncontrol.h" "5" +"debuggersourcepathmappingwidget.h" "5" +"debuggertooltipmanager.h" "5" +"disassembleragent.h" "5" +"disassemblerlines.h" "5" +"imageviewer.h" "5" +"loadcoredialog.h" "5" +"localsandexpressionswindow.h" "5" +"logwindow.h" "5" +"memoryagent.h" "5" +"moduleshandler.h" "5" +"outputcollector.h" "5" +"procinterrupt.h" "5" +"registerhandler.h" "5" +"registerpostmortemaction.h" "5" +"simplifytype.h" "5" +"snapshothandler.h" "5" +"snapshotwindow.h" "5" +"sourceagent.h" "5" +"sourcefileshandler.h" "5" +"sourceutils.h" "5" +"stackframe.h" "5" +"stackhandler.h" "5" +"stackwindow.h" "5" +"terminal.h" "5" +"threaddata.h" "5" +"threadshandler.h" "5" +"unstartedappwatcherdialog.h" "5" +"watchdata.h" "5" +"watchdelegatewidgets.h" "5" +"watchhandler.h" "5" +"watchutils.h" "5" +"watchwindow.h" "5" "Designer" "2" "designer.qbs:4" "3" "cpp" "3" "designer.qbs:67" "4" -"cpp" "4" -"formclasswizard.cpp" "5" -"formclasswizard.h" "5" -"formclasswizarddialog.cpp" "5" -"formclasswizarddialog.h" "5" -"formclasswizardpage.cpp" "5" -"formclasswizardpage.h" "5" -"formclasswizardpage.ui" "5" -"formclasswizardparameters.cpp" "5" -"formclasswizardparameters.h" "5" +"formclasswizard.cpp" "4" +"formclasswizard.h" "4" +"formclasswizarddialog.cpp" "4" +"formclasswizarddialog.h" "4" +"formclasswizardpage.cpp" "4" +"formclasswizardpage.h" "4" +"formclasswizardpage.ui" "4" +"formclasswizardparameters.cpp" "4" +"formclasswizardparameters.h" "4" "General" "3" "designer.qbs:30" "4" "codemodelhelpers.cpp" "4" @@ -7730,16 +7754,16 @@ "settingspage.h" "4" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"Designer.json.in" "5" +"Designer.json.in" "4" "Shared Sources" "3" "designer.qbs:55" "4" -"formresizer.cpp" "5" -"formresizer.h" "5" -"sizehandlerect.cpp" "5" -"sizehandlerect.h" "5" -"widgethost.cpp" "5" -"widgethost.h" "5" -"widgethostconstants.h" "5" +"formresizer.cpp" "4" +"formresizer.h" "4" +"sizehandlerect.cpp" "4" +"sizehandlerect.h" "4" +"widgethost.cpp" "4" +"widgethost.h" "4" +"widgethostconstants.h" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -7753,7 +7777,7 @@ "diffeditor.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"DiffEditor.json.in" "5" +"DiffEditor.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -7802,7 +7826,7 @@ "emacskeys.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"EmacsKeys.json.in" "5" +"EmacsKeys.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -7818,7 +7842,7 @@ "fakevim.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"FakeVim.json.in" "5" +"FakeVim.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -7845,7 +7869,7 @@ "genericprojectmanager.qbs:4" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"GenericProjectManager.json.in" "5" +"GenericProjectManager.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -7875,33 +7899,32 @@ "git.qbs:3" "3" "Gerrit" "3" "git.qbs:78" "4" -"gerrit" "4" -"authenticationdialog.cpp" "5" -"authenticationdialog.h" "5" -"authenticationdialog.ui" "5" -"branchcombobox.cpp" "5" -"branchcombobox.h" "5" -"gerritdialog.cpp" "5" -"gerritdialog.h" "5" -"gerritdialog.ui" "5" -"gerritmodel.cpp" "5" -"gerritmodel.h" "5" -"gerritoptionspage.cpp" "5" -"gerritoptionspage.h" "5" -"gerritparameters.cpp" "5" -"gerritparameters.h" "5" -"gerritplugin.cpp" "5" -"gerritplugin.h" "5" -"gerritpushdialog.cpp" "5" -"gerritpushdialog.h" "5" -"gerritpushdialog.ui" "5" -"gerritremotechooser.cpp" "5" -"gerritremotechooser.h" "5" -"gerritserver.cpp" "5" -"gerritserver.h" "5" +"authenticationdialog.cpp" "4" +"authenticationdialog.h" "4" +"authenticationdialog.ui" "4" +"branchcombobox.cpp" "4" +"branchcombobox.h" "4" +"gerritdialog.cpp" "4" +"gerritdialog.h" "4" +"gerritdialog.ui" "4" +"gerritmodel.cpp" "4" +"gerritmodel.h" "4" +"gerritoptionspage.cpp" "4" +"gerritoptionspage.h" "4" +"gerritparameters.cpp" "4" +"gerritparameters.h" "4" +"gerritplugin.cpp" "4" +"gerritplugin.h" "4" +"gerritpushdialog.cpp" "4" +"gerritpushdialog.h" "4" +"gerritpushdialog.ui" "4" +"gerritremotechooser.cpp" "4" +"gerritremotechooser.h" "4" +"gerritserver.cpp" "4" +"gerritserver.h" "4" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"Git.json.in" "5" +"Git.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -7974,7 +7997,7 @@ "glsleditor.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"GLSLEditor.json.in" "5" +"GLSLEditor.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -8002,7 +8025,7 @@ "helloworld.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"HelloWorld.json.in" "5" +"HelloWorld.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -8017,23 +8040,23 @@ "help.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"Help.json.in" "5" +"Help.json.in" "4" "Shared Sources" "3" "help.qbs:64" "4" -"bookmarkdialog.ui" "5" -"bookmarkmanager.cpp" "5" -"bookmarkmanager.h" "5" -"contentwindow.cpp" "5" -"contentwindow.h" "5" -"filternamedialog.cpp" "5" -"filternamedialog.h" "5" -"filternamedialog.ui" "5" -"helpicons.h" "5" -"indexwindow.cpp" "5" -"indexwindow.h" "5" -"topicchooser.cpp" "5" -"topicchooser.h" "5" -"topicchooser.ui" "5" +"bookmarkdialog.ui" "4" +"bookmarkmanager.cpp" "4" +"bookmarkmanager.h" "4" +"contentwindow.cpp" "4" +"contentwindow.h" "4" +"filternamedialog.cpp" "4" +"filternamedialog.h" "4" +"filternamedialog.ui" "4" +"helpicons.h" "4" +"indexwindow.cpp" "4" +"indexwindow.h" "4" +"topicchooser.cpp" "4" +"topicchooser.h" "4" +"topicchooser.ui" "4" "Sources" "3" "help.qbs:28" "4" "centralwidget.cpp" "4" @@ -8104,7 +8127,7 @@ "imageviewer.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"ImageViewer.json.in" "5" +"ImageViewer.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -8131,7 +8154,7 @@ "ios.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"Ios.json.in" "5" +"Ios.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -8243,7 +8266,7 @@ "macros.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"Macros.json.in" "5" +"Macros.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -8287,7 +8310,7 @@ "mercurial.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"Mercurial.json.in" "5" +"Mercurial.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -8328,7 +8351,7 @@ "modeleditor.qbs:5" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"ModelEditor.json.in" "5" +"ModelEditor.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -8387,13 +8410,12 @@ "nim.qbs:3" "3" "Editor" "3" "nim.qbs:24" "4" -"editor" "4" -"nimeditorfactory.cpp" "5" -"nimeditorfactory.h" "5" -"nimhighlighter.cpp" "5" -"nimhighlighter.h" "5" -"nimindenter.cpp" "5" -"nimindenter.h" "5" +"nimeditorfactory.cpp" "4" +"nimeditorfactory.h" "4" +"nimhighlighter.cpp" "4" +"nimhighlighter.h" "4" +"nimindenter.cpp" "4" +"nimindenter.h" "4" "General" "3" "nim.qbs:15" "4" "nim.qrc" "4" @@ -8406,46 +8428,44 @@ "nimplugin.h" "4" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"Nim.json.in" "5" +"Nim.json.in" "4" "Project" "3" "nim.qbs:34" "4" -"project" "4" -"nimbuildconfiguration.cpp" "5" -"nimbuildconfiguration.h" "5" -"nimbuildconfigurationwidget.cpp" "5" -"nimbuildconfigurationwidget.h" "5" -"nimcompilerbuildstep.cpp" "5" -"nimcompilerbuildstep.h" "5" -"nimcompilerbuildstepconfigwidget.cpp" "5" -"nimcompilerbuildstepconfigwidget.h" "5" -"nimcompilerbuildstepconfigwidget.ui" "5" -"nimcompilercleanstep.cpp" "5" -"nimcompilercleanstep.h" "5" -"nimcompilercleanstepconfigwidget.cpp" "5" -"nimcompilercleanstepconfigwidget.h" "5" -"nimcompilercleanstepconfigwidget.ui" "5" -"nimproject.cpp" "5" -"nimproject.h" "5" -"nimprojectnode.cpp" "5" -"nimprojectnode.h" "5" -"nimrunconfiguration.cpp" "5" -"nimrunconfiguration.h" "5" -"nimtoolchain.cpp" "5" -"nimtoolchain.h" "5" -"nimtoolchainfactory.cpp" "5" -"nimtoolchainfactory.h" "5" +"nimbuildconfiguration.cpp" "4" +"nimbuildconfiguration.h" "4" +"nimbuildconfigurationwidget.cpp" "4" +"nimbuildconfigurationwidget.h" "4" +"nimcompilerbuildstep.cpp" "4" +"nimcompilerbuildstep.h" "4" +"nimcompilerbuildstepconfigwidget.cpp" "4" +"nimcompilerbuildstepconfigwidget.h" "4" +"nimcompilerbuildstepconfigwidget.ui" "4" +"nimcompilercleanstep.cpp" "4" +"nimcompilercleanstep.h" "4" +"nimcompilercleanstepconfigwidget.cpp" "4" +"nimcompilercleanstepconfigwidget.h" "4" +"nimcompilercleanstepconfigwidget.ui" "4" +"nimproject.cpp" "4" +"nimproject.h" "4" +"nimprojectnode.cpp" "4" +"nimprojectnode.h" "4" +"nimrunconfiguration.cpp" "4" +"nimrunconfiguration.h" "4" +"nimtoolchain.cpp" "4" +"nimtoolchain.h" "4" +"nimtoolchainfactory.cpp" "4" +"nimtoolchainfactory.h" "4" "Settings" "3" "nim.qbs:52" "4" -"settings" "4" -"nimcodestylepreferencesfactory.cpp" "5" -"nimcodestylepreferencesfactory.h" "5" -"nimcodestylepreferenceswidget.cpp" "5" -"nimcodestylepreferenceswidget.h" "5" -"nimcodestylepreferenceswidget.ui" "5" -"nimcodestylesettingspage.cpp" "5" -"nimcodestylesettingspage.h" "5" -"nimsettings.cpp" "5" -"nimsettings.h" "5" +"nimcodestylepreferencesfactory.cpp" "4" +"nimcodestylepreferencesfactory.h" "4" +"nimcodestylepreferenceswidget.cpp" "4" +"nimcodestylepreferenceswidget.h" "4" +"nimcodestylepreferenceswidget.ui" "4" +"nimcodestylesettingspage.cpp" "4" +"nimcodestylesettingspage.h" "4" +"nimsettings.cpp" "4" +"nimsettings.h" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -8454,15 +8474,14 @@ "qtcreator_pch.h" "5" "Tools" "3" "nim.qbs:63" "4" -"tools" "4" -"nimlexer.cpp" "5" -"nimlexer.h" "5" -"sourcecodestream.h" "5" +"nimlexer.cpp" "4" +"nimlexer.h" "4" +"sourcecodestream.h" "4" "Perforce" "2" "perforce.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"Perforce.json.in" "5" +"Perforce.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -8501,65 +8520,63 @@ "projectexplorer.qbs:8" "4" "CustomWizard" "4" "projectexplorer.qbs:180" "5" -"customwizard" "5" -"customwizard.cpp" "6" -"customwizard.h" "6" -"customwizardpage.cpp" "6" -"customwizardpage.h" "6" -"customwizardparameters.cpp" "6" -"customwizardparameters.h" "6" -"customwizardscriptgenerator.cpp" "6" -"customwizardscriptgenerator.h" "6" +"customwizard.cpp" "5" +"customwizard.h" "5" +"customwizardpage.cpp" "5" +"customwizardpage.h" "5" +"customwizardparameters.cpp" "5" +"customwizardparameters.h" "5" +"customwizardscriptgenerator.cpp" "5" +"customwizardscriptgenerator.h" "5" "Device Support" "4" "projectexplorer.qbs:191" "5" -"devicesupport" "5" -"desktopdevice.cpp" "6" -"desktopdevice.h" "6" -"desktopdeviceconfigurationwidget.cpp" "6" -"desktopdeviceconfigurationwidget.h" "6" -"desktopdeviceconfigurationwidget.ui" "6" -"desktopdevicefactory.cpp" "6" -"desktopdevicefactory.h" "6" -"desktopdeviceprocess.cpp" "6" -"desktopdeviceprocess.h" "6" -"desktopprocesssignaloperation.cpp" "6" -"desktopprocesssignaloperation.h" "6" -"devicecheckbuildstep.cpp" "6" -"devicecheckbuildstep.h" "6" -"devicefactoryselectiondialog.cpp" "6" -"devicefactoryselectiondialog.h" "6" -"devicefactoryselectiondialog.ui" "6" -"devicemanager.cpp" "6" -"devicemanager.h" "6" -"devicemanagermodel.cpp" "6" -"devicemanagermodel.h" "6" -"deviceprocess.cpp" "6" -"deviceprocess.h" "6" -"deviceprocessesdialog.cpp" "6" -"deviceprocessesdialog.h" "6" -"deviceprocesslist.cpp" "6" -"deviceprocesslist.h" "6" -"devicesettingspage.cpp" "6" -"devicesettingspage.h" "6" -"devicesettingswidget.cpp" "6" -"devicesettingswidget.h" "6" -"devicesettingswidget.ui" "6" -"devicetestdialog.cpp" "6" -"devicetestdialog.h" "6" -"devicetestdialog.ui" "6" -"deviceusedportsgatherer.cpp" "6" -"deviceusedportsgatherer.h" "6" -"idevice.cpp" "6" -"idevice.h" "6" -"idevicefactory.cpp" "6" -"idevicefactory.h" "6" -"idevicewidget.h" "6" -"localprocesslist.cpp" "6" -"localprocesslist.h" "6" -"sshdeviceprocess.cpp" "6" -"sshdeviceprocess.h" "6" -"sshdeviceprocesslist.cpp" "6" -"sshdeviceprocesslist.h" "6" +"desktopdevice.cpp" "5" +"desktopdevice.h" "5" +"desktopdeviceconfigurationwidget.cpp" "5" +"desktopdeviceconfigurationwidget.h" "5" +"desktopdeviceconfigurationwidget.ui" "5" +"desktopdevicefactory.cpp" "5" +"desktopdevicefactory.h" "5" +"desktopdeviceprocess.cpp" "5" +"desktopdeviceprocess.h" "5" +"desktopprocesssignaloperation.cpp" "5" +"desktopprocesssignaloperation.h" "5" +"devicecheckbuildstep.cpp" "5" +"devicecheckbuildstep.h" "5" +"devicefactoryselectiondialog.cpp" "5" +"devicefactoryselectiondialog.h" "5" +"devicefactoryselectiondialog.ui" "5" +"devicemanager.cpp" "5" +"devicemanager.h" "5" +"devicemanagermodel.cpp" "5" +"devicemanagermodel.h" "5" +"deviceprocess.cpp" "5" +"deviceprocess.h" "5" +"deviceprocessesdialog.cpp" "5" +"deviceprocessesdialog.h" "5" +"deviceprocesslist.cpp" "5" +"deviceprocesslist.h" "5" +"devicesettingspage.cpp" "5" +"devicesettingspage.h" "5" +"devicesettingswidget.cpp" "5" +"devicesettingswidget.h" "5" +"devicesettingswidget.ui" "5" +"devicetestdialog.cpp" "5" +"devicetestdialog.h" "5" +"devicetestdialog.ui" "5" +"deviceusedportsgatherer.cpp" "5" +"deviceusedportsgatherer.h" "5" +"idevice.cpp" "5" +"idevice.h" "5" +"idevicefactory.cpp" "5" +"idevicefactory.h" "5" +"idevicewidget.h" "5" +"localprocesslist.cpp" "5" +"localprocesslist.h" "5" +"sshdeviceprocess.cpp" "5" +"sshdeviceprocess.h" "5" +"sshdeviceprocesslist.cpp" "5" +"sshdeviceprocesslist.h" "5" "General" "4" "projectexplorer.qbs:18" "5" "abi.cpp" "5" @@ -8894,124 +8911,122 @@ "xcodebuildparser.h" "5" "Images" "4" "projectexplorer.qbs:220" "5" -"images" "5" -"analyzer_overlay_small.png" "6" -"analyzer_overlay_small@2x.png" "6" -"build.png" "6" -"build@2x.png" "6" -"build_32.png" "6" -"build_hammerhandle_mask.png" "6" -"build_hammerhandle_mask@2x.png" "6" -"build_hammerhead_mask.png" "6" -"build_hammerhead_mask@2x.png" "6" -"buildhammerhandle.png" "6" -"buildhammerhandle@2x.png" "6" -"buildhammerhead.png" "6" -"buildhammerhead@2x.png" "6" -"BuildSettings.png" "6" -"buildstepdisable.png" "6" -"buildstepdisable@2x.png" "6" -"buildstepmovedown.png" "6" -"buildstepmovedown@2x.png" "6" -"buildstepmoveup.png" "6" -"buildstepmoveup@2x.png" "6" -"buildstepremove.png" "6" -"buildstepremove@2x.png" "6" -"cancelbuild_overlay.png" "6" -"cancelbuild_overlay@2x.png" "6" -"closetab.png" "6" -"CodeStyleSettings.png" "6" -"continue_1_small.png" "6" -"continue_1_small@2x.png" "6" -"continue_2_small.png" "6" -"continue_2_small@2x.png" "6" -"debugger_beetle_mask.png" "6" -"debugger_beetle_mask@2x.png" "6" -"debugger_overlay_small.png" "6" -"debugger_overlay_small@2x.png" "6" -"debugger_start.png" "6" -"debugger_start@2x.png" "6" -"desktopdevice.png" "6" -"desktopdevice@2x.png" "6" -"devicestatusindicator.png" "6" -"devicestatusindicator@2x.png" "6" -"EditorSettings.png" "6" -"fileoverlay_cpp.png" "6" -"fileoverlay_cpp@2x.png" "6" -"fileoverlay_h.png" "6" -"fileoverlay_h@2x.png" "6" -"fileoverlay_qml.png" "6" -"fileoverlay_qml@2x.png" "6" -"fileoverlay_qrc.png" "6" -"fileoverlay_qrc@2x.png" "6" -"fileoverlay_qt.png" "6" -"fileoverlay_qt@2x.png" "6" -"fileoverlay_scxml.png" "6" -"fileoverlay_scxml@2x.png" "6" -"fileoverlay_ui.png" "6" -"fileoverlay_ui@2x.png" "6" -"fileoverlay_unknown.png" "6" -"fileoverlay_unknown@2x.png" "6" -"findallprojects.png" "6" -"findproject.png" "6" -"MaemoDevice.png" "6" -"mode_project.png" "6" -"mode_project@2x.png" "6" -"mode_project_mask.png" "6" -"mode_project_mask@2x.png" "6" -"ProjectDependencies.png" "6" -"projectexplorer.png" "6" -"rebuildhammerhandles.png" "6" -"rebuildhammerhandles@2x.png" "6" -"rebuildhammerheads.png" "6" -"rebuildhammerheads@2x.png" "6" -"run.png" "6" -"run@2x.png" "6" -"run_mask.png" "6" -"run_mask@2x.png" "6" -"RunSettings.png" "6" -"session.png" "6" -"settingscategory_buildrun.png" "6" -"settingscategory_buildrun@2x.png" "6" -"settingscategory_devices.png" "6" -"settingscategory_devices@2x.png" "6" -"settingscategory_kits.png" "6" -"settingscategory_kits@2x.png" "6" -"Simulator.png" "6" -"targetpanel_bottom.png" "6" -"unconfigured.png" "6" -"window.png" "6" +"analyzer_overlay_small.png" "5" +"analyzer_overlay_small@2x.png" "5" +"build.png" "5" +"build@2x.png" "5" +"build_32.png" "5" +"build_hammerhandle_mask.png" "5" +"build_hammerhandle_mask@2x.png" "5" +"build_hammerhead_mask.png" "5" +"build_hammerhead_mask@2x.png" "5" +"buildhammerhandle.png" "5" +"buildhammerhandle@2x.png" "5" +"buildhammerhead.png" "5" +"buildhammerhead@2x.png" "5" +"BuildSettings.png" "5" +"buildstepdisable.png" "5" +"buildstepdisable@2x.png" "5" +"buildstepmovedown.png" "5" +"buildstepmovedown@2x.png" "5" +"buildstepmoveup.png" "5" +"buildstepmoveup@2x.png" "5" +"buildstepremove.png" "5" +"buildstepremove@2x.png" "5" +"cancelbuild_overlay.png" "5" +"cancelbuild_overlay@2x.png" "5" +"closetab.png" "5" +"CodeStyleSettings.png" "5" +"continue_1_small.png" "5" +"continue_1_small@2x.png" "5" +"continue_2_small.png" "5" +"continue_2_small@2x.png" "5" +"debugger_beetle_mask.png" "5" +"debugger_beetle_mask@2x.png" "5" +"debugger_overlay_small.png" "5" +"debugger_overlay_small@2x.png" "5" +"debugger_start.png" "5" +"debugger_start@2x.png" "5" +"desktopdevice.png" "5" +"desktopdevice@2x.png" "5" +"devicestatusindicator.png" "5" +"devicestatusindicator@2x.png" "5" +"EditorSettings.png" "5" +"fileoverlay_cpp.png" "5" +"fileoverlay_cpp@2x.png" "5" +"fileoverlay_h.png" "5" +"fileoverlay_h@2x.png" "5" +"fileoverlay_qml.png" "5" +"fileoverlay_qml@2x.png" "5" +"fileoverlay_qrc.png" "5" +"fileoverlay_qrc@2x.png" "5" +"fileoverlay_qt.png" "5" +"fileoverlay_qt@2x.png" "5" +"fileoverlay_scxml.png" "5" +"fileoverlay_scxml@2x.png" "5" +"fileoverlay_ui.png" "5" +"fileoverlay_ui@2x.png" "5" +"fileoverlay_unknown.png" "5" +"fileoverlay_unknown@2x.png" "5" +"findallprojects.png" "5" +"findproject.png" "5" +"MaemoDevice.png" "5" +"mode_project.png" "5" +"mode_project@2x.png" "5" +"mode_project_mask.png" "5" +"mode_project_mask@2x.png" "5" +"ProjectDependencies.png" "5" +"projectexplorer.png" "5" +"rebuildhammerhandles.png" "5" +"rebuildhammerhandles@2x.png" "5" +"rebuildhammerheads.png" "5" +"rebuildhammerheads@2x.png" "5" +"run.png" "5" +"run@2x.png" "5" +"run_mask.png" "5" +"run_mask@2x.png" "5" +"RunSettings.png" "5" +"session.png" "5" +"settingscategory_buildrun.png" "5" +"settingscategory_buildrun@2x.png" "5" +"settingscategory_devices.png" "5" +"settingscategory_devices@2x.png" "5" +"settingscategory_kits.png" "5" +"settingscategory_kits@2x.png" "5" +"Simulator.png" "5" +"targetpanel_bottom.png" "5" +"unconfigured.png" "5" +"window.png" "5" "JsonWizard" "4" "projectexplorer.qbs:161" "5" -"jsonwizard" "5" -"jsonfieldpage.cpp" "6" -"jsonfieldpage.h" "6" -"jsonfieldpage_p.h" "6" -"jsonfilepage.cpp" "6" -"jsonfilepage.h" "6" -"jsonkitspage.cpp" "6" -"jsonkitspage.h" "6" -"jsonprojectpage.cpp" "6" -"jsonprojectpage.h" "6" -"jsonsummarypage.cpp" "6" -"jsonsummarypage.h" "6" -"jsonwizard.cpp" "6" -"jsonwizard.h" "6" -"jsonwizardfactory.cpp" "6" -"jsonwizardfactory.h" "6" -"jsonwizardfilegenerator.cpp" "6" -"jsonwizardfilegenerator.h" "6" -"jsonwizardgeneratorfactory.cpp" "6" -"jsonwizardgeneratorfactory.h" "6" -"jsonwizardpagefactory.cpp" "6" -"jsonwizardpagefactory.h" "6" -"jsonwizardpagefactory_p.cpp" "6" -"jsonwizardpagefactory_p.h" "6" -"jsonwizardscannergenerator.cpp" "6" -"jsonwizardscannergenerator.h" "6" +"jsonfieldpage.cpp" "5" +"jsonfieldpage.h" "5" +"jsonfieldpage_p.h" "5" +"jsonfilepage.cpp" "5" +"jsonfilepage.h" "5" +"jsonkitspage.cpp" "5" +"jsonkitspage.h" "5" +"jsonprojectpage.cpp" "5" +"jsonprojectpage.h" "5" +"jsonsummarypage.cpp" "5" +"jsonsummarypage.h" "5" +"jsonwizard.cpp" "5" +"jsonwizard.h" "5" +"jsonwizardfactory.cpp" "5" +"jsonwizardfactory.h" "5" +"jsonwizardfilegenerator.cpp" "5" +"jsonwizardfilegenerator.h" "5" +"jsonwizardgeneratorfactory.cpp" "5" +"jsonwizardgeneratorfactory.h" "5" +"jsonwizardpagefactory.cpp" "5" +"jsonwizardpagefactory.h" "5" +"jsonwizardpagefactory_p.cpp" "5" +"jsonwizardpagefactory_p.h" "5" +"jsonwizardscannergenerator.cpp" "5" +"jsonwizardscannergenerator.h" "5" "PluginMetaData" "4" "QtcPlugin.qbs:49" "5" -"ProjectExplorer.json.in" "6" +"ProjectExplorer.json.in" "5" "Project Welcome Page" "4" "projectexplorer.qbs:153" "5" "projectwelcomepage.cpp" "5" @@ -9038,178 +9053,178 @@ "projectexplorer.qbs:6" "4" "Group 1" "4" "QtcDevHeaders.qbs:10" "5" -"customwizard" "6" -"customwizard.h" "7" -"customwizardpage.h" "7" -"customwizardparameters.h" "7" -"customwizardscriptgenerator.h" "7" -"devicesupport" "6" -"desktopdevice.h" "7" -"desktopdeviceconfigurationwidget.h" "7" -"desktopdevicefactory.h" "7" -"desktopdeviceprocess.h" "7" -"desktopprocesssignaloperation.h" "7" -"devicecheckbuildstep.h" "7" -"devicefactoryselectiondialog.h" "7" -"devicemanager.h" "7" -"devicemanagermodel.h" "7" -"deviceprocess.h" "7" -"deviceprocessesdialog.h" "7" -"deviceprocesslist.h" "7" -"devicesettingspage.h" "7" -"devicesettingswidget.h" "7" -"devicetestdialog.h" "7" -"deviceusedportsgatherer.h" "7" -"idevice.h" "7" -"idevicefactory.h" "7" -"idevicewidget.h" "7" -"localprocesslist.h" "7" -"sshdeviceprocess.h" "7" -"sshdeviceprocesslist.h" "7" -"jsonwizard" "6" -"jsonfieldpage.h" "7" -"jsonfieldpage_p.h" "7" -"jsonfilepage.h" "7" -"jsonkitspage.h" "7" -"jsonprojectpage.h" "7" -"jsonsummarypage.h" "7" -"jsonwizard.h" "7" -"jsonwizardfactory.h" "7" -"jsonwizardfilegenerator.h" "7" -"jsonwizardgeneratorfactory.h" "7" -"jsonwizardpagefactory.h" "7" -"jsonwizardpagefactory_p.h" "7" -"jsonwizardscannergenerator.h" "7" -"abi.h" "6" -"abiwidget.h" "6" -"abstractmsvctoolchain.h" "6" -"abstractprocessstep.h" "6" -"allprojectsfilter.h" "6" -"allprojectsfind.h" "6" -"ansifilterparser.h" "6" -"applicationlauncher.h" "6" -"appoutputpane.h" "6" -"baseprojectwizarddialog.h" "6" -"buildconfiguration.h" "6" -"buildenvironmentwidget.h" "6" -"buildinfo.h" "6" -"buildmanager.h" "6" -"buildprogress.h" "6" -"buildsettingspropertiespage.h" "6" -"buildstep.h" "6" -"buildsteplist.h" "6" -"buildstepspage.h" "6" -"buildtargetinfo.h" "6" -"clangparser.h" "6" -"codestylesettingspropertiespage.h" "6" -"compileoutputwindow.h" "6" -"configtaskhandler.h" "6" -"copytaskhandler.h" "6" -"currentprojectfilter.h" "6" -"currentprojectfind.h" "6" -"customexecutablerunconfiguration.h" "6" -"customparser.h" "6" -"customparserconfigdialog.h" "6" -"customtoolchain.h" "6" -"dependenciespanel.h" "6" -"deployablefile.h" "6" -"deployconfiguration.h" "6" -"deploymentdata.h" "6" -"deploymentdatamodel.h" "6" -"deploymentdataview.h" "6" -"editorconfiguration.h" "6" -"editorsettingspropertiespage.h" "6" -"environmentaspect.h" "6" -"environmentaspectwidget.h" "6" -"environmentwidget.h" "6" -"expanddata.h" "6" -"extracompiler.h" "6" -"foldernavigationwidget.h" "6" -"gccparser.h" "6" -"gcctoolchain.h" "6" -"gcctoolchainfactories.h" "6" -"gnumakeparser.h" "6" -"headerpath.h" "6" -"importwidget.h" "6" -"ioutputparser.h" "6" -"ipotentialkit.h" "6" -"itaskhandler.h" "6" -"journaldwatcher.h" "6" -"kit.h" "6" -"kitchooser.h" "6" -"kitconfigwidget.h" "6" -"kitfeatureprovider.h" "6" -"kitinformation.h" "6" -"kitinformationconfigwidget.h" "6" -"kitmanager.h" "6" -"kitmanagerconfigwidget.h" "6" -"kitmodel.h" "6" -"kitoptionspage.h" "6" -"ldparser.h" "6" -"linuxiccparser.h" "6" -"localenvironmentaspect.h" "6" -"miniprojecttargetselector.h" "6" -"msvcparser.h" "6" -"msvctoolchain.h" "6" -"namedwidget.h" "6" -"osparser.h" "6" -"outputparser_test.h" "6" -"panelswidget.h" "6" -"processparameters.h" "6" -"processstep.h" "6" -"project.h" "6" -"projectconfiguration.h" "6" -"projectconfigurationmodel.h" "6" -"projectexplorer.h" "6" -"projectexplorer_export.h" "6" -"projectexplorer_global.h" "6" -"projectexplorerconstants.h" "6" -"projectexplorericons.h" "6" -"projectexplorersettings.h" "6" -"projectexplorersettingspage.h" "6" -"projectfilewizardextension.h" "6" -"projectimporter.h" "6" -"projectmacro.h" "6" -"projectmacroexpander.h" "6" -"projectmanager.h" "6" -"projectmodels.h" "6" -"projectnodes.h" "6" -"projectpanelfactory.h" "6" -"projecttree.h" "6" -"projecttreewidget.h" "6" -"projectwelcomepage.h" "6" -"projectwindow.h" "6" -"projectwizardpage.h" "6" -"removetaskhandler.h" "6" -"runconfiguration.h" "6" -"runconfigurationaspects.h" "6" -"runsettingspropertiespage.h" "6" -"selectablefilesmodel.h" "6" -"session.h" "6" -"sessiondialog.h" "6" -"sessionmodel.h" "6" -"sessionview.h" "6" -"showineditortaskhandler.h" "6" -"showoutputtaskhandler.h" "6" -"subscription.h" "6" -"target.h" "6" -"targetsettingspanel.h" "6" -"targetsetuppage.h" "6" -"targetsetupwidget.h" "6" -"task.h" "6" -"taskhub.h" "6" -"taskmodel.h" "6" -"taskwindow.h" "6" -"toolchain.h" "6" -"toolchainconfigwidget.h" "6" -"toolchainmanager.h" "6" -"toolchainoptionspage.h" "6" -"toolchainsettingsaccessor.h" "6" -"userfileaccessor.h" "6" -"vcsannotatetaskhandler.h" "6" -"waitforstopdialog.h" "6" -"windebuginterface.h" "6" -"xcodebuildparser.h" "6" +"customwizard" "5" +"customwizard.h" "6" +"customwizardpage.h" "6" +"customwizardparameters.h" "6" +"customwizardscriptgenerator.h" "6" +"devicesupport" "5" +"desktopdevice.h" "6" +"desktopdeviceconfigurationwidget.h" "6" +"desktopdevicefactory.h" "6" +"desktopdeviceprocess.h" "6" +"desktopprocesssignaloperation.h" "6" +"devicecheckbuildstep.h" "6" +"devicefactoryselectiondialog.h" "6" +"devicemanager.h" "6" +"devicemanagermodel.h" "6" +"deviceprocess.h" "6" +"deviceprocessesdialog.h" "6" +"deviceprocesslist.h" "6" +"devicesettingspage.h" "6" +"devicesettingswidget.h" "6" +"devicetestdialog.h" "6" +"deviceusedportsgatherer.h" "6" +"idevice.h" "6" +"idevicefactory.h" "6" +"idevicewidget.h" "6" +"localprocesslist.h" "6" +"sshdeviceprocess.h" "6" +"sshdeviceprocesslist.h" "6" +"jsonwizard" "5" +"jsonfieldpage.h" "6" +"jsonfieldpage_p.h" "6" +"jsonfilepage.h" "6" +"jsonkitspage.h" "6" +"jsonprojectpage.h" "6" +"jsonsummarypage.h" "6" +"jsonwizard.h" "6" +"jsonwizardfactory.h" "6" +"jsonwizardfilegenerator.h" "6" +"jsonwizardgeneratorfactory.h" "6" +"jsonwizardpagefactory.h" "6" +"jsonwizardpagefactory_p.h" "6" +"jsonwizardscannergenerator.h" "6" +"abi.h" "5" +"abiwidget.h" "5" +"abstractmsvctoolchain.h" "5" +"abstractprocessstep.h" "5" +"allprojectsfilter.h" "5" +"allprojectsfind.h" "5" +"ansifilterparser.h" "5" +"applicationlauncher.h" "5" +"appoutputpane.h" "5" +"baseprojectwizarddialog.h" "5" +"buildconfiguration.h" "5" +"buildenvironmentwidget.h" "5" +"buildinfo.h" "5" +"buildmanager.h" "5" +"buildprogress.h" "5" +"buildsettingspropertiespage.h" "5" +"buildstep.h" "5" +"buildsteplist.h" "5" +"buildstepspage.h" "5" +"buildtargetinfo.h" "5" +"clangparser.h" "5" +"codestylesettingspropertiespage.h" "5" +"compileoutputwindow.h" "5" +"configtaskhandler.h" "5" +"copytaskhandler.h" "5" +"currentprojectfilter.h" "5" +"currentprojectfind.h" "5" +"customexecutablerunconfiguration.h" "5" +"customparser.h" "5" +"customparserconfigdialog.h" "5" +"customtoolchain.h" "5" +"dependenciespanel.h" "5" +"deployablefile.h" "5" +"deployconfiguration.h" "5" +"deploymentdata.h" "5" +"deploymentdatamodel.h" "5" +"deploymentdataview.h" "5" +"editorconfiguration.h" "5" +"editorsettingspropertiespage.h" "5" +"environmentaspect.h" "5" +"environmentaspectwidget.h" "5" +"environmentwidget.h" "5" +"expanddata.h" "5" +"extracompiler.h" "5" +"foldernavigationwidget.h" "5" +"gccparser.h" "5" +"gcctoolchain.h" "5" +"gcctoolchainfactories.h" "5" +"gnumakeparser.h" "5" +"headerpath.h" "5" +"importwidget.h" "5" +"ioutputparser.h" "5" +"ipotentialkit.h" "5" +"itaskhandler.h" "5" +"journaldwatcher.h" "5" +"kit.h" "5" +"kitchooser.h" "5" +"kitconfigwidget.h" "5" +"kitfeatureprovider.h" "5" +"kitinformation.h" "5" +"kitinformationconfigwidget.h" "5" +"kitmanager.h" "5" +"kitmanagerconfigwidget.h" "5" +"kitmodel.h" "5" +"kitoptionspage.h" "5" +"ldparser.h" "5" +"linuxiccparser.h" "5" +"localenvironmentaspect.h" "5" +"miniprojecttargetselector.h" "5" +"msvcparser.h" "5" +"msvctoolchain.h" "5" +"namedwidget.h" "5" +"osparser.h" "5" +"outputparser_test.h" "5" +"panelswidget.h" "5" +"processparameters.h" "5" +"processstep.h" "5" +"project.h" "5" +"projectconfiguration.h" "5" +"projectconfigurationmodel.h" "5" +"projectexplorer.h" "5" +"projectexplorer_export.h" "5" +"projectexplorer_global.h" "5" +"projectexplorerconstants.h" "5" +"projectexplorericons.h" "5" +"projectexplorersettings.h" "5" +"projectexplorersettingspage.h" "5" +"projectfilewizardextension.h" "5" +"projectimporter.h" "5" +"projectmacro.h" "5" +"projectmacroexpander.h" "5" +"projectmanager.h" "5" +"projectmodels.h" "5" +"projectnodes.h" "5" +"projectpanelfactory.h" "5" +"projecttree.h" "5" +"projecttreewidget.h" "5" +"projectwelcomepage.h" "5" +"projectwindow.h" "5" +"projectwizardpage.h" "5" +"removetaskhandler.h" "5" +"runconfiguration.h" "5" +"runconfigurationaspects.h" "5" +"runsettingspropertiespage.h" "5" +"selectablefilesmodel.h" "5" +"session.h" "5" +"sessiondialog.h" "5" +"sessionmodel.h" "5" +"sessionview.h" "5" +"showineditortaskhandler.h" "5" +"showoutputtaskhandler.h" "5" +"subscription.h" "5" +"target.h" "5" +"targetsettingspanel.h" "5" +"targetsetuppage.h" "5" +"targetsetupwidget.h" "5" +"task.h" "5" +"taskhub.h" "5" +"taskmodel.h" "5" +"taskwindow.h" "5" +"toolchain.h" "5" +"toolchainconfigwidget.h" "5" +"toolchainmanager.h" "5" +"toolchainoptionspage.h" "5" +"toolchainsettingsaccessor.h" "5" +"userfileaccessor.h" "5" +"vcsannotatetaskhandler.h" "5" +"waitforstopdialog.h" "5" +"windebuginterface.h" "5" +"xcodebuildparser.h" "5" "ptracepreload" "2" "ptracepreload.qbs:3" "3" "standard pch file (gui)" "3" @@ -9237,7 +9252,7 @@ "pythonscanner.h" "4" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"PythonEditor.json.in" "5" +"PythonEditor.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -9248,11 +9263,11 @@ "qbsprojectmanager.qbs:5" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"QbsProjectManager.json.in" "5" +"QbsProjectManager.json.in" "4" "qbs qml type info" "3" "qbsprojectmanager.qbs:124" "4" -"qbs-bundle.json" "5" -"qbs.qmltypes" "5" +"qbs-bundle.json" "4" +"qbs.qmltypes" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -9324,7 +9339,7 @@ "qmakeandroidsupport.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"QmakeAndroidSupport.json.in" "5" +"QmakeAndroidSupport.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -9352,26 +9367,25 @@ "qmakeprojectmanager.qbs:8" "4" "Custom Widget Wizard" "4" "qmakeprojectmanager.qbs:60" "5" -"customwidgetwizard" "5" -"classdefinition.cpp" "6" -"classdefinition.h" "6" -"classdefinition.ui" "6" -"classlist.cpp" "6" -"classlist.h" "6" -"customwidgetpluginwizardpage.cpp" "6" -"customwidgetpluginwizardpage.h" "6" -"customwidgetpluginwizardpage.ui" "6" -"customwidgetwidgetswizardpage.cpp" "6" -"customwidgetwidgetswizardpage.h" "6" -"customwidgetwidgetswizardpage.ui" "6" -"customwidgetwizard.cpp" "6" -"customwidgetwizard.h" "6" -"customwidgetwizarddialog.cpp" "6" -"customwidgetwizarddialog.h" "6" -"filenamingparameters.h" "6" -"plugingenerator.cpp" "6" -"plugingenerator.h" "6" -"pluginoptions.h" "6" +"classdefinition.cpp" "5" +"classdefinition.h" "5" +"classdefinition.ui" "5" +"classlist.cpp" "5" +"classlist.h" "5" +"customwidgetpluginwizardpage.cpp" "5" +"customwidgetpluginwizardpage.h" "5" +"customwidgetpluginwizardpage.ui" "5" +"customwidgetwidgetswizardpage.cpp" "5" +"customwidgetwidgetswizardpage.h" "5" +"customwidgetwidgetswizardpage.ui" "5" +"customwidgetwizard.cpp" "5" +"customwidgetwizard.h" "5" +"customwidgetwizarddialog.cpp" "5" +"customwidgetwizarddialog.h" "5" +"filenamingparameters.h" "5" +"plugingenerator.cpp" "5" +"plugingenerator.h" "5" +"pluginoptions.h" "5" "General" "4" "qmakeprojectmanager.qbs:25" "5" "addlibrarywizard.cpp" "5" @@ -9439,7 +9453,7 @@ "qtmodulesinfo.h" "5" "PluginMetaData" "4" "QtcPlugin.qbs:49" "5" -"QmakeProjectManager.json.in" "6" +"QmakeProjectManager.json.in" "5" "standard pch file (gui)" "4" "QtcProduct.qbs:65" "5" "qtcreator_gui_pch.h" "6" @@ -9448,102 +9462,101 @@ "qtcreator_pch.h" "6" "Wizard Images" "4" "qmakeprojectmanager.qbs:96" "5" -"console.png" "6" -"gui.png" "6" -"lib.png" "6" -"qtquickapp.png" "6" +"console.png" "5" +"gui.png" "5" +"lib.png" "5" +"qtquickapp.png" "5" "Wizards" "4" "qmakeprojectmanager.qbs:76" "5" -"wizards" "5" -"filespage.cpp" "6" -"filespage.h" "6" -"guiappwizard.cpp" "6" -"guiappwizard.h" "6" -"guiappwizarddialog.cpp" "6" -"guiappwizarddialog.h" "6" -"libraryparameters.cpp" "6" -"libraryparameters.h" "6" -"librarywizard.cpp" "6" -"librarywizard.h" "6" -"librarywizarddialog.cpp" "6" -"librarywizarddialog.h" "6" -"modulespage.cpp" "6" -"modulespage.h" "6" -"qtprojectparameters.cpp" "6" -"qtprojectparameters.h" "6" -"qtwizard.cpp" "6" -"qtwizard.h" "6" -"simpleprojectwizard.cpp" "6" -"simpleprojectwizard.h" "6" -"subdirsprojectwizard.cpp" "6" -"subdirsprojectwizard.h" "6" -"subdirsprojectwizarddialog.cpp" "6" -"subdirsprojectwizarddialog.h" "6" -"wizards.qrc" "6" -"/wizards" "7" -"images" "8" -"console.png" "9" -"console@2x.png" "9" -"gui.png" "9" -"gui@2x.png" "9" -"lib.png" "9" -"lib@2x.png" "9" -"qtquickapp.png" "9" +"filespage.cpp" "5" +"filespage.h" "5" +"guiappwizard.cpp" "5" +"guiappwizard.h" "5" +"guiappwizarddialog.cpp" "5" +"guiappwizarddialog.h" "5" +"libraryparameters.cpp" "5" +"libraryparameters.h" "5" +"librarywizard.cpp" "5" +"librarywizard.h" "5" +"librarywizarddialog.cpp" "5" +"librarywizarddialog.h" "5" +"modulespage.cpp" "5" +"modulespage.h" "5" +"qtprojectparameters.cpp" "5" +"qtprojectparameters.h" "5" +"qtwizard.cpp" "5" +"qtwizard.h" "5" +"simpleprojectwizard.cpp" "5" +"simpleprojectwizard.h" "5" +"subdirsprojectwizard.cpp" "5" +"subdirsprojectwizard.h" "5" +"subdirsprojectwizarddialog.cpp" "5" +"subdirsprojectwizarddialog.h" "5" +"wizards.qrc" "5" +"/wizards" "6" +"images" "7" +"console.png" "8" +"console@2x.png" "8" +"gui.png" "8" +"gui@2x.png" "8" +"lib.png" "8" +"lib@2x.png" "8" +"qtquickapp.png" "8" "QmakeProjectManager dev headers" "3" "qmakeprojectmanager.qbs:6" "4" "Group 1" "4" "QtcDevHeaders.qbs:10" "5" -"customwidgetwizard" "6" -"classdefinition.h" "7" -"classlist.h" "7" -"customwidgetpluginwizardpage.h" "7" -"customwidgetwidgetswizardpage.h" "7" -"customwidgetwizard.h" "7" -"customwidgetwizarddialog.h" "7" -"filenamingparameters.h" "7" -"plugingenerator.h" "7" -"pluginoptions.h" "7" -"wizards" "6" -"filespage.h" "7" -"guiappwizard.h" "7" -"guiappwizarddialog.h" "7" -"libraryparameters.h" "7" -"librarywizard.h" "7" -"librarywizarddialog.h" "7" -"modulespage.h" "7" -"qtprojectparameters.h" "7" -"qtwizard.h" "7" -"simpleprojectwizard.h" "7" -"subdirsprojectwizard.h" "7" -"subdirsprojectwizarddialog.h" "7" -"addlibrarywizard.h" "6" -"applicationlauncher.h" "6" -"desktopqmakerunconfiguration.h" "6" -"externaleditors.h" "6" -"librarydetailscontroller.h" "6" -"makefileparse.h" "6" -"makestep.h" "6" -"profilecompletionassist.h" "6" -"profileeditor.h" "6" -"profilehighlighter.h" "6" -"profilehoverhandler.h" "6" -"qmakebuildconfiguration.h" "6" -"qmakebuildinfo.h" "6" -"qmakekitconfigwidget.h" "6" -"qmakekitinformation.h" "6" -"qmakenodes.h" "6" -"qmakenodetreebuilder.h" "6" -"qmakeparser.h" "6" -"qmakeparsernodes.h" "6" -"qmakeproject.h" "6" -"qmakeprojectconfigwidget.h" "6" -"qmakeprojectimporter.h" "6" -"qmakeprojectmanager.h" "6" -"qmakeprojectmanager_global.h" "6" -"qmakeprojectmanagerconstants.h" "6" -"qmakeprojectmanagerplugin.h" "6" -"qmakestep.h" "6" -"qtmodulesinfo.h" "6" +"customwidgetwizard" "5" +"classdefinition.h" "6" +"classlist.h" "6" +"customwidgetpluginwizardpage.h" "6" +"customwidgetwidgetswizardpage.h" "6" +"customwidgetwizard.h" "6" +"customwidgetwizarddialog.h" "6" +"filenamingparameters.h" "6" +"plugingenerator.h" "6" +"pluginoptions.h" "6" +"wizards" "5" +"filespage.h" "6" +"guiappwizard.h" "6" +"guiappwizarddialog.h" "6" +"libraryparameters.h" "6" +"librarywizard.h" "6" +"librarywizarddialog.h" "6" +"modulespage.h" "6" +"qtprojectparameters.h" "6" +"qtwizard.h" "6" +"simpleprojectwizard.h" "6" +"subdirsprojectwizard.h" "6" +"subdirsprojectwizarddialog.h" "6" +"addlibrarywizard.h" "5" +"applicationlauncher.h" "5" +"desktopqmakerunconfiguration.h" "5" +"externaleditors.h" "5" +"librarydetailscontroller.h" "5" +"makefileparse.h" "5" +"makestep.h" "5" +"profilecompletionassist.h" "5" +"profileeditor.h" "5" +"profilehighlighter.h" "5" +"profilehoverhandler.h" "5" +"qmakebuildconfiguration.h" "5" +"qmakebuildinfo.h" "5" +"qmakekitconfigwidget.h" "5" +"qmakekitinformation.h" "5" +"qmakenodes.h" "5" +"qmakenodetreebuilder.h" "5" +"qmakeparser.h" "5" +"qmakeparsernodes.h" "5" +"qmakeproject.h" "5" +"qmakeprojectconfigwidget.h" "5" +"qmakeprojectimporter.h" "5" +"qmakeprojectmanager.h" "5" +"qmakeprojectmanager_global.h" "5" +"qmakeprojectmanagerconstants.h" "5" +"qmakeprojectmanagerplugin.h" "5" +"qmakestep.h" "5" +"qtmodulesinfo.h" "5" "QML designer projects" "2" "qmldesigner.qbs:3" "3" "componentsplugin" "3" @@ -9678,90 +9691,89 @@ "qmldesignerplugin.qbs:9" "5" "extension" "5" "qmldesignerplugin.qbs:590" "6" -"qmldesignerextension" "6" -"colortool" "7" -"colortool.cpp" "8" -"colortool.h" "8" -"connectioneditor" "7" -"addnewbackenddialog.cpp" "8" -"addnewbackenddialog.h" "8" -"addnewbackenddialog.ui" "8" -"backendmodel.cpp" "8" -"backendmodel.h" "8" -"bindingmodel.cpp" "8" -"bindingmodel.h" "8" -"connectioneditor.qrc" "8" -"/connectionview" "9" -"stylesheet.css" "10" -"connectionmodel.cpp" "8" -"connectionmodel.h" "8" -"connectionview.cpp" "8" -"connectionview.h" "8" -"connectionviewwidget.cpp" "8" -"connectionviewwidget.h" "8" -"connectionviewwidget.ui" "8" -"delegates.cpp" "8" -"delegates.h" "8" -"dynamicpropertiesmodel.cpp" "8" -"dynamicpropertiesmodel.h" "8" -"stylesheet.css" "8" -"pathtool" "7" -"controlpoint.cpp" "8" -"controlpoint.h" "8" -"cubicsegment.cpp" "8" -"cubicsegment.h" "8" -"pathitem.cpp" "8" -"pathitem.h" "8" -"pathselectionmanipulator.cpp" "8" -"pathselectionmanipulator.h" "8" -"pathtool.cpp" "8" -"pathtool.h" "8" -"pathtoolview.cpp" "8" -"pathtoolview.h" "8" -"sourcetool" "7" -"sourcetool.cpp" "8" -"sourcetool.h" "8" -"texttool" "7" -"textedititem.cpp" "8" -"textedititem.h" "8" -"textedititemwidget.cpp" "8" -"textedititemwidget.h" "8" -"texttool.cpp" "8" -"texttool.h" "8" -"qmldesignerextension_global.h" "7" -"qmldesignerextensionconstants.h" "7" +"colortool" "6" +"colortool.cpp" "7" +"colortool.h" "7" +"connectioneditor" "6" +"addnewbackenddialog.cpp" "7" +"addnewbackenddialog.h" "7" +"addnewbackenddialog.ui" "7" +"backendmodel.cpp" "7" +"backendmodel.h" "7" +"bindingmodel.cpp" "7" +"bindingmodel.h" "7" +"connectioneditor.qrc" "7" +"/connectionview" "8" +"stylesheet.css" "9" +"connectionmodel.cpp" "7" +"connectionmodel.h" "7" +"connectionview.cpp" "7" +"connectionview.h" "7" +"connectionviewwidget.cpp" "7" +"connectionviewwidget.h" "7" +"connectionviewwidget.ui" "7" +"delegates.cpp" "7" +"delegates.h" "7" +"dynamicpropertiesmodel.cpp" "7" +"dynamicpropertiesmodel.h" "7" +"stylesheet.css" "7" +"pathtool" "6" +"controlpoint.cpp" "7" +"controlpoint.h" "7" +"cubicsegment.cpp" "7" +"cubicsegment.h" "7" +"pathitem.cpp" "7" +"pathitem.h" "7" +"pathselectionmanipulator.cpp" "7" +"pathselectionmanipulator.h" "7" +"pathtool.cpp" "7" +"pathtool.h" "7" +"pathtoolview.cpp" "7" +"pathtoolview.h" "7" +"sourcetool" "6" +"sourcetool.cpp" "7" +"sourcetool.h" "7" +"texttool" "6" +"textedititem.cpp" "7" +"textedititem.h" "7" +"textedititemwidget.cpp" "7" +"textedititemwidget.h" "7" +"texttool.cpp" "7" +"texttool.h" "7" +"qmldesignerextension_global.h" "6" +"qmldesignerextensionconstants.h" "6" "Group 4" "5" "qmldesignerplugin.qbs:74" "6" -"addarraymembervisitor.cpp" "7" -"addarraymembervisitor.h" "7" -"addobjectvisitor.cpp" "7" -"addobjectvisitor.h" "7" -"addpropertyvisitor.cpp" "7" -"addpropertyvisitor.h" "7" -"astobjecttextextractor.cpp" "7" -"astobjecttextextractor.h" "7" -"changeimportsvisitor.cpp" "7" -"changeimportsvisitor.h" "7" -"changeobjecttypevisitor.cpp" "7" -"changeobjecttypevisitor.h" "7" -"changepropertyvisitor.cpp" "7" -"changepropertyvisitor.h" "7" -"firstdefinitionfinder.cpp" "7" -"firstdefinitionfinder.h" "7" -"moveobjectbeforeobjectvisitor.cpp" "7" -"moveobjectbeforeobjectvisitor.h" "7" -"moveobjectvisitor.cpp" "7" -"moveobjectvisitor.h" "7" -"objectlengthcalculator.cpp" "7" -"objectlengthcalculator.h" "7" -"qmlrefactoring.cpp" "7" -"qmlrefactoring.h" "7" -"qmlrewriter.cpp" "7" -"qmlrewriter.h" "7" -"removepropertyvisitor.cpp" "7" -"removepropertyvisitor.h" "7" -"removeuiobjectmembervisitor.cpp" "7" -"removeuiobjectmembervisitor.h" "7" +"addarraymembervisitor.cpp" "6" +"addarraymembervisitor.h" "6" +"addobjectvisitor.cpp" "6" +"addobjectvisitor.h" "6" +"addpropertyvisitor.cpp" "6" +"addpropertyvisitor.h" "6" +"astobjecttextextractor.cpp" "6" +"astobjecttextextractor.h" "6" +"changeimportsvisitor.cpp" "6" +"changeimportsvisitor.h" "6" +"changeobjecttypevisitor.cpp" "6" +"changeobjecttypevisitor.h" "6" +"changepropertyvisitor.cpp" "6" +"changepropertyvisitor.h" "6" +"firstdefinitionfinder.cpp" "6" +"firstdefinitionfinder.h" "6" +"moveobjectbeforeobjectvisitor.cpp" "6" +"moveobjectbeforeobjectvisitor.h" "6" +"moveobjectvisitor.cpp" "6" +"moveobjectvisitor.h" "6" +"objectlengthcalculator.cpp" "6" +"objectlengthcalculator.h" "6" +"qmlrefactoring.cpp" "6" +"qmlrefactoring.h" "6" +"qmlrewriter.cpp" "6" +"qmlrewriter.h" "6" +"removepropertyvisitor.cpp" "6" +"removepropertyvisitor.h" "6" +"removeuiobjectmembervisitor.cpp" "6" +"removeuiobjectmembervisitor.h" "6" "Group 5" "5" "qmldesignerplugin.qbs:110" "6" "commands" "7" @@ -9849,445 +9861,443 @@ "enumeration.h" "8" "Group 8" "5" "qmldesignerplugin.qbs:211" "6" -"designercore" "6" -"exceptions" "7" -"exception.cpp" "8" -"invalidargumentexception.cpp" "8" -"invalididexception.cpp" "8" -"invalidmetainfoexception.cpp" "8" -"invalidmodelnodeexception.cpp" "8" -"invalidmodelstateexception.cpp" "8" -"invalidpropertyexception.cpp" "8" -"invalidqmlsourceexception.cpp" "8" -"invalidreparentingexception.cpp" "8" -"invalidslideindexexception.cpp" "8" -"notimplementedexception.cpp" "8" -"removebasestateexception.cpp" "8" -"rewritingexception.cpp" "8" -"include" "7" -"abstractproperty.h" "8" -"abstractview.h" "8" -"anchorline.h" "8" -"basetexteditmodifier.h" "8" -"bindingproperty.h" "8" -"componenttextmodifier.h" "8" -"customnotifications.h" "8" -"documentmessage.h" "8" -"exception.h" "8" -"forwardview.h" "8" -"import.h" "8" -"invalidargumentexception.h" "8" -"invalididexception.h" "8" -"invalidmetainfoexception.h" "8" -"invalidmodelnodeexception.h" "8" -"invalidmodelstateexception.h" "8" -"invalidpropertyexception.h" "8" -"invalidqmlsourceexception.h" "8" -"invalidreparentingexception.h" "8" -"invalidslideindexexception.h" "8" -"itemlibraryinfo.h" "8" -"mathutils.h" "8" -"metainfo.h" "8" -"metainforeader.h" "8" -"model.h" "8" -"modelmerger.h" "8" -"modelnode.h" "8" -"modelnodepositionstorage.h" "8" -"nodeabstractproperty.h" "8" -"nodehints.h" "8" -"nodeinstance.h" "8" -"nodeinstanceview.h" "8" -"nodelistproperty.h" "8" -"nodemetainfo.h" "8" -"nodeproperty.h" "8" -"notimplementedexception.h" "8" -"plaintexteditmodifier.h" "8" -"propertycontainer.h" "8" -"propertynode.h" "8" -"propertyparser.h" "8" -"qmlanchors.h" "8" -"qmlchangeset.h" "8" -"qmlitemnode.h" "8" -"qmlmodelnodefacade.h" "8" -"qmlobjectnode.h" "8" -"qmlstate.h" "8" -"qmltimeline.h" "8" -"qmltimelinekeyframegroup.h" "8" -"removebasestateexception.h" "8" -"rewriterview.h" "8" -"rewritingexception.h" "8" -"signalhandlerproperty.h" "8" -"subcomponentmanager.h" "8" -"textmodifier.h" "8" -"variantproperty.h" "8" -"viewmanager.h" "8" -"instances" "7" -"nodeinstance.cpp" "8" -"nodeinstanceserverproxy.cpp" "8" -"nodeinstanceserverproxy.h" "8" -"nodeinstanceview.cpp" "8" -"puppetbuildprogressdialog.cpp" "8" -"puppetbuildprogressdialog.h" "8" -"puppetbuildprogressdialog.ui" "8" -"puppetcreator.cpp" "8" -"puppetcreator.h" "8" -"puppetdialog.cpp" "8" -"puppetdialog.h" "8" -"puppetdialog.ui" "8" -"metainfo" "7" -"itemlibraryinfo.cpp" "8" -"metainfo.cpp" "8" -"metainforeader.cpp" "8" -"nodehints.cpp" "8" -"nodemetainfo.cpp" "8" -"subcomponentmanager.cpp" "8" -"model" "7" -"abstractproperty.cpp" "8" -"abstractview.cpp" "8" -"anchorline.cpp" "8" -"basetexteditmodifier.cpp" "8" -"bindingproperty.cpp" "8" -"componenttextmodifier.cpp" "8" -"documentmessage.cpp" "8" -"import.cpp" "8" -"internalbindingproperty.cpp" "8" -"internalbindingproperty.h" "8" -"internalnode.cpp" "8" -"internalnode_p.h" "8" -"internalnodeabstractproperty.cpp" "8" -"internalnodeabstractproperty.h" "8" -"internalnodelistproperty.cpp" "8" -"internalnodelistproperty.h" "8" -"internalnodeproperty.cpp" "8" -"internalnodeproperty.h" "8" -"internalproperty.cpp" "8" -"internalproperty.h" "8" -"internalsignalhandlerproperty.cpp" "8" -"internalsignalhandlerproperty.h" "8" -"internalvariantproperty.cpp" "8" -"internalvariantproperty.h" "8" -"model.cpp" "8" -"model_p.h" "8" -"modelmerger.cpp" "8" -"modelnode.cpp" "8" -"modelnodepositionrecalculator.cpp" "8" -"modelnodepositionrecalculator.h" "8" -"modelnodepositionstorage.cpp" "8" -"modeltotextmerger.cpp" "8" -"modeltotextmerger.h" "8" -"nodeabstractproperty.cpp" "8" -"nodelistproperty.cpp" "8" -"nodeproperty.cpp" "8" -"plaintexteditmodifier.cpp" "8" -"propertycontainer.cpp" "8" -"propertynode.cpp" "8" -"propertyparser.cpp" "8" -"qmlanchors.cpp" "8" -"qmlchangeset.cpp" "8" -"qmlitemnode.cpp" "8" -"qmlmodelnodefacade.cpp" "8" -"qmlobjectnode.cpp" "8" -"qmlstate.cpp" "8" -"qmltextgenerator.cpp" "8" -"qmltextgenerator.h" "8" -"qmltimeline.cpp" "8" -"qmltimelinekeyframegroup.cpp" "8" -"rewriteaction.cpp" "8" -"rewriteaction.h" "8" -"rewriteactioncompressor.cpp" "8" -"rewriteactioncompressor.h" "8" -"rewriterview.cpp" "8" -"signalhandlerproperty.cpp" "8" -"textmodifier.cpp" "8" -"texttomodelmerger.cpp" "8" -"texttomodelmerger.h" "8" -"variantproperty.cpp" "8" -"viewmanager.cpp" "8" -"pluginmanager" "7" -"widgetpluginmanager.cpp" "8" -"widgetpluginmanager.h" "8" -"widgetpluginpath.cpp" "8" -"widgetpluginpath.h" "8" -"rewritertransaction.cpp" "7" -"rewritertransaction.h" "7" +"exceptions" "6" +"exception.cpp" "7" +"invalidargumentexception.cpp" "7" +"invalididexception.cpp" "7" +"invalidmetainfoexception.cpp" "7" +"invalidmodelnodeexception.cpp" "7" +"invalidmodelstateexception.cpp" "7" +"invalidpropertyexception.cpp" "7" +"invalidqmlsourceexception.cpp" "7" +"invalidreparentingexception.cpp" "7" +"invalidslideindexexception.cpp" "7" +"notimplementedexception.cpp" "7" +"removebasestateexception.cpp" "7" +"rewritingexception.cpp" "7" +"include" "6" +"abstractproperty.h" "7" +"abstractview.h" "7" +"anchorline.h" "7" +"basetexteditmodifier.h" "7" +"bindingproperty.h" "7" +"componenttextmodifier.h" "7" +"customnotifications.h" "7" +"documentmessage.h" "7" +"exception.h" "7" +"forwardview.h" "7" +"import.h" "7" +"invalidargumentexception.h" "7" +"invalididexception.h" "7" +"invalidmetainfoexception.h" "7" +"invalidmodelnodeexception.h" "7" +"invalidmodelstateexception.h" "7" +"invalidpropertyexception.h" "7" +"invalidqmlsourceexception.h" "7" +"invalidreparentingexception.h" "7" +"invalidslideindexexception.h" "7" +"itemlibraryinfo.h" "7" +"mathutils.h" "7" +"metainfo.h" "7" +"metainforeader.h" "7" +"model.h" "7" +"modelmerger.h" "7" +"modelnode.h" "7" +"modelnodepositionstorage.h" "7" +"nodeabstractproperty.h" "7" +"nodehints.h" "7" +"nodeinstance.h" "7" +"nodeinstanceview.h" "7" +"nodelistproperty.h" "7" +"nodemetainfo.h" "7" +"nodeproperty.h" "7" +"notimplementedexception.h" "7" +"plaintexteditmodifier.h" "7" +"propertycontainer.h" "7" +"propertynode.h" "7" +"propertyparser.h" "7" +"qmlanchors.h" "7" +"qmlchangeset.h" "7" +"qmlitemnode.h" "7" +"qmlmodelnodefacade.h" "7" +"qmlobjectnode.h" "7" +"qmlstate.h" "7" +"qmltimeline.h" "7" +"qmltimelinekeyframegroup.h" "7" +"removebasestateexception.h" "7" +"rewriterview.h" "7" +"rewritingexception.h" "7" +"signalhandlerproperty.h" "7" +"subcomponentmanager.h" "7" +"textmodifier.h" "7" +"variantproperty.h" "7" +"viewmanager.h" "7" +"instances" "6" +"nodeinstance.cpp" "7" +"nodeinstanceserverproxy.cpp" "7" +"nodeinstanceserverproxy.h" "7" +"nodeinstanceview.cpp" "7" +"puppetbuildprogressdialog.cpp" "7" +"puppetbuildprogressdialog.h" "7" +"puppetbuildprogressdialog.ui" "7" +"puppetcreator.cpp" "7" +"puppetcreator.h" "7" +"puppetdialog.cpp" "7" +"puppetdialog.h" "7" +"puppetdialog.ui" "7" +"metainfo" "6" +"itemlibraryinfo.cpp" "7" +"metainfo.cpp" "7" +"metainforeader.cpp" "7" +"nodehints.cpp" "7" +"nodemetainfo.cpp" "7" +"subcomponentmanager.cpp" "7" +"model" "6" +"abstractproperty.cpp" "7" +"abstractview.cpp" "7" +"anchorline.cpp" "7" +"basetexteditmodifier.cpp" "7" +"bindingproperty.cpp" "7" +"componenttextmodifier.cpp" "7" +"documentmessage.cpp" "7" +"import.cpp" "7" +"internalbindingproperty.cpp" "7" +"internalbindingproperty.h" "7" +"internalnode.cpp" "7" +"internalnode_p.h" "7" +"internalnodeabstractproperty.cpp" "7" +"internalnodeabstractproperty.h" "7" +"internalnodelistproperty.cpp" "7" +"internalnodelistproperty.h" "7" +"internalnodeproperty.cpp" "7" +"internalnodeproperty.h" "7" +"internalproperty.cpp" "7" +"internalproperty.h" "7" +"internalsignalhandlerproperty.cpp" "7" +"internalsignalhandlerproperty.h" "7" +"internalvariantproperty.cpp" "7" +"internalvariantproperty.h" "7" +"model.cpp" "7" +"model_p.h" "7" +"modelmerger.cpp" "7" +"modelnode.cpp" "7" +"modelnodepositionrecalculator.cpp" "7" +"modelnodepositionrecalculator.h" "7" +"modelnodepositionstorage.cpp" "7" +"modeltotextmerger.cpp" "7" +"modeltotextmerger.h" "7" +"nodeabstractproperty.cpp" "7" +"nodelistproperty.cpp" "7" +"nodeproperty.cpp" "7" +"plaintexteditmodifier.cpp" "7" +"propertycontainer.cpp" "7" +"propertynode.cpp" "7" +"propertyparser.cpp" "7" +"qmlanchors.cpp" "7" +"qmlchangeset.cpp" "7" +"qmlitemnode.cpp" "7" +"qmlmodelnodefacade.cpp" "7" +"qmlobjectnode.cpp" "7" +"qmlstate.cpp" "7" +"qmltextgenerator.cpp" "7" +"qmltextgenerator.h" "7" +"qmltimeline.cpp" "7" +"qmltimelinekeyframegroup.cpp" "7" +"rewriteaction.cpp" "7" +"rewriteaction.h" "7" +"rewriteactioncompressor.cpp" "7" +"rewriteactioncompressor.h" "7" +"rewriterview.cpp" "7" +"signalhandlerproperty.cpp" "7" +"textmodifier.cpp" "7" +"texttomodelmerger.cpp" "7" +"texttomodelmerger.h" "7" +"variantproperty.cpp" "7" +"viewmanager.cpp" "7" +"pluginmanager" "6" +"widgetpluginmanager.cpp" "7" +"widgetpluginmanager.h" "7" +"widgetpluginpath.cpp" "7" +"widgetpluginpath.h" "7" +"rewritertransaction.cpp" "6" +"rewritertransaction.h" "6" "Group 9" "5" "qmldesignerplugin.qbs:371" "6" -"components" "6" -"componentcore" "7" -"abstractaction.cpp" "8" -"abstractaction.h" "8" -"abstractactiongroup.cpp" "8" -"abstractactiongroup.h" "8" -"actioninterface.h" "8" -"addimagesdialog.cpp" "8" -"addimagesdialog.h" "8" -"addsignalhandlerdialog.cpp" "8" -"addsignalhandlerdialog.h" "8" -"addsignalhandlerdialog.ui" "8" -"changestyleaction.cpp" "8" -"changestyleaction.h" "8" -"componentcore.qrc" "8" -"/qmldesigner/icon/designeractions" "9" -"images" "10" -"column.png" "11" -"column@2x.png" "11" -"grid.png" "11" -"grid@2x.png" "11" -"lower.png" "11" -"lower@2x.png" "11" -"raise.png" "11" -"raise@2x.png" "11" -"row.png" "11" -"row@2x.png" "11" -"componentcore_constants.h" "8" -"crumblebar.cpp" "8" -"crumblebar.h" "8" -"designeractionmanager.cpp" "8" -"designeractionmanager.h" "8" -"designeractionmanagerview.cpp" "8" -"designeractionmanagerview.h" "8" -"findimplementation.cpp" "8" -"findimplementation.h" "8" -"layoutingridlayout.cpp" "8" -"layoutingridlayout.h" "8" -"modelnodecontextmenu.cpp" "8" -"modelnodecontextmenu.h" "8" -"modelnodecontextmenu_helper.cpp" "8" -"modelnodecontextmenu_helper.h" "8" -"modelnodeoperations.cpp" "8" -"modelnodeoperations.h" "8" -"qmldesignericonprovider.cpp" "8" -"qmldesignericonprovider.h" "8" -"selectioncontext.cpp" "8" -"selectioncontext.h" "8" -"theme.cpp" "8" -"theme.h" "8" -"zoomaction.cpp" "8" -"zoomaction.h" "8" -"debugview" "7" -"debugview.cpp" "8" -"debugview.h" "8" -"debugviewwidget.cpp" "8" -"debugviewwidget.h" "8" -"debugviewwidget.ui" "8" -"formeditor" "7" -"abstractcustomtool.cpp" "8" -"abstractcustomtool.h" "8" -"abstractformeditortool.cpp" "8" -"abstractformeditortool.h" "8" -"anchorindicator.cpp" "8" -"anchorindicator.h" "8" -"anchorindicatorgraphicsitem.cpp" "8" -"anchorindicatorgraphicsitem.h" "8" -"backgroundaction.cpp" "8" -"backgroundaction.h" "8" -"bindingindicator.cpp" "8" -"bindingindicator.h" "8" -"bindingindicatorgraphicsitem.cpp" "8" -"bindingindicatorgraphicsitem.h" "8" -"contentnoteditableindicator.cpp" "8" -"contentnoteditableindicator.h" "8" -"controlelement.cpp" "8" -"controlelement.h" "8" -"dragtool.cpp" "8" -"dragtool.h" "8" -"formeditor.qrc" "8" -"/icon/layout" "9" -"no_snapping.png" "10" -"no_snapping@2x.png" "10" -"snapping.png" "10" -"snapping@2x.png" "10" -"snapping_and_anchoring.png" "10" -"snapping_and_anchoring@2x.png" "10" -"formeditorgraphicsview.cpp" "8" -"formeditorgraphicsview.h" "8" -"formeditoritem.cpp" "8" -"formeditoritem.h" "8" -"formeditorscene.cpp" "8" -"formeditorscene.h" "8" -"formeditortoolbutton.cpp" "8" -"formeditortoolbutton.h" "8" -"formeditorview.cpp" "8" -"formeditorview.h" "8" -"formeditorwidget.cpp" "8" -"formeditorwidget.h" "8" -"itemutilfunctions.cpp" "8" -"itemutilfunctions.h" "8" -"layeritem.cpp" "8" -"layeritem.h" "8" -"lineeditaction.cpp" "8" -"lineeditaction.h" "8" -"movemanipulator.cpp" "8" -"movemanipulator.h" "8" -"movetool.cpp" "8" -"movetool.h" "8" -"numberseriesaction.cpp" "8" -"numberseriesaction.h" "8" -"onedimensionalcluster.cpp" "8" -"onedimensionalcluster.h" "8" -"resizecontroller.cpp" "8" -"resizecontroller.h" "8" -"resizehandleitem.cpp" "8" -"resizehandleitem.h" "8" -"resizeindicator.cpp" "8" -"resizeindicator.h" "8" -"resizemanipulator.cpp" "8" -"resizemanipulator.h" "8" -"resizetool.cpp" "8" -"resizetool.h" "8" -"rubberbandselectionmanipulator.cpp" "8" -"rubberbandselectionmanipulator.h" "8" -"scaleitem.cpp" "8" -"scaleitem.h" "8" -"scalemanipulator.cpp" "8" -"scalemanipulator.h" "8" -"selectionindicator.cpp" "8" -"selectionindicator.h" "8" -"selectionrectangle.cpp" "8" -"selectionrectangle.h" "8" -"selectiontool.cpp" "8" -"selectiontool.h" "8" -"singleselectionmanipulator.cpp" "8" -"singleselectionmanipulator.h" "8" -"snapper.cpp" "8" -"snapper.h" "8" -"snappinglinecreator.cpp" "8" -"snappinglinecreator.h" "8" -"toolbox.cpp" "8" -"toolbox.h" "8" -"importmanager" "7" -"importlabel.cpp" "8" -"importlabel.h" "8" -"importmanager.css" "8" -"importmanager.qrc" "8" -"/importmanager" "9" -"importmanager.css" "10" -"importmanagercombobox.cpp" "8" -"importmanagercombobox.h" "8" -"importmanagerview.cpp" "8" -"importmanagerview.h" "8" -"importswidget.cpp" "8" -"importswidget.h" "8" -"integration" "7" -"componentaction.cpp" "8" -"componentaction.h" "8" -"componentview.cpp" "8" -"componentview.h" "8" -"designdocument.cpp" "8" -"designdocument.h" "8" -"designdocumentview.cpp" "8" -"designdocumentview.h" "8" -"stackedutilitypanelcontroller.cpp" "8" -"stackedutilitypanelcontroller.h" "8" -"utilitypanelcontroller.cpp" "8" -"utilitypanelcontroller.h" "8" -"itemlibrary" "7" -"customfilesystemmodel.cpp" "8" -"customfilesystemmodel.h" "8" -"itemlibrary.qrc" "8" -"/ItemLibrary" "9" -"images" "10" -"item-default-icon.png" "11" -"item-invalid-icon.png" "11" -"itemlibraryimageprovider.cpp" "8" -"itemlibraryimageprovider.h" "8" -"itemlibraryitem.cpp" "8" -"itemlibraryitem.h" "8" -"itemlibrarymodel.cpp" "8" -"itemlibrarymodel.h" "8" -"itemlibraryresourceview.cpp" "8" -"itemlibraryresourceview.h" "8" -"itemlibrarysection.cpp" "8" -"itemlibrarysection.h" "8" -"itemlibrarysectionmodel.cpp" "8" -"itemlibrarysectionmodel.h" "8" -"itemlibraryview.cpp" "8" -"itemlibraryview.h" "8" -"itemlibrarywidget.cpp" "8" -"itemlibrarywidget.h" "8" -"navigator" "7" -"iconcheckboxitemdelegate.cpp" "8" -"iconcheckboxitemdelegate.h" "8" -"nameitemdelegate.cpp" "8" -"nameitemdelegate.h" "8" -"navigator.qrc" "8" -"/navigator/icon" "9" -"arrowdown.png" "10" -"arrowdown@2x.png" "10" -"arrowleft.png" "10" -"arrowleft@2x.png" "10" -"arrowright.png" "10" -"arrowright@2x.png" "10" -"arrowup.png" "10" -"arrowup@2x.png" "10" -"export_checked.png" "10" -"export_checked@2x.png" "10" -"export_unchecked.png" "10" -"export_unchecked@2x.png" "10" -"navigatortreemodel.cpp" "8" -"navigatortreemodel.h" "8" -"navigatortreeview.cpp" "8" -"navigatortreeview.h" "8" -"navigatorview.cpp" "8" -"navigatorview.h" "8" -"navigatorwidget.cpp" "8" -"navigatorwidget.h" "8" -"propertyeditor" "7" -"designerpropertymap.cpp" "8" -"designerpropertymap.h" "8" -"fileresourcesmodel.cpp" "8" -"fileresourcesmodel.h" "8" -"gradientmodel.cpp" "8" -"gradientmodel.h" "8" -"propertyeditorcontextobject.cpp" "8" -"propertyeditorcontextobject.h" "8" -"propertyeditorqmlbackend.cpp" "8" -"propertyeditorqmlbackend.h" "8" -"propertyeditortransaction.cpp" "8" -"propertyeditortransaction.h" "8" -"propertyeditorvalue.cpp" "8" -"propertyeditorvalue.h" "8" -"propertyeditorview.cpp" "8" -"propertyeditorview.h" "8" -"propertyeditorwidget.cpp" "8" -"propertyeditorwidget.h" "8" -"qmlanchorbindingproxy.cpp" "8" -"qmlanchorbindingproxy.h" "8" -"qmlmodelnodeproxy.cpp" "8" -"qmlmodelnodeproxy.h" "8" -"quick2propertyeditorview.cpp" "8" -"quick2propertyeditorview.h" "8" -"resources" "7" -"resources.qrc" "8" -"/qmldesigner" "9" -"images" "10" -"spliteditorhorizontally.png" "11" -"spliteditorhorizontally@2x.png" "11" -"spliteditorvertically.png" "11" -"spliteditorvertically@2x.png" "11" -"centerwidget.css" "10" -"formeditorstylesheet.css" "10" -"scrollbar.css" "10" -"stylesheet.css" "10" -"stateseditor" "7" -"stateseditorimageprovider.cpp" "8" -"stateseditorimageprovider.h" "8" -"stateseditormodel.cpp" "8" -"stateseditormodel.h" "8" -"stateseditorview.cpp" "8" -"stateseditorview.h" "8" -"stateseditorwidget.cpp" "8" -"stateseditorwidget.h" "8" -"texteditor" "7" -"texteditorstatusbar.cpp" "8" -"texteditorstatusbar.h" "8" -"texteditorview.cpp" "8" -"texteditorview.h" "8" -"texteditorwidget.cpp" "8" -"texteditorwidget.h" "8" +"componentcore" "6" +"abstractaction.cpp" "7" +"abstractaction.h" "7" +"abstractactiongroup.cpp" "7" +"abstractactiongroup.h" "7" +"actioninterface.h" "7" +"addimagesdialog.cpp" "7" +"addimagesdialog.h" "7" +"addsignalhandlerdialog.cpp" "7" +"addsignalhandlerdialog.h" "7" +"addsignalhandlerdialog.ui" "7" +"changestyleaction.cpp" "7" +"changestyleaction.h" "7" +"componentcore.qrc" "7" +"/qmldesigner/icon/designeractions" "8" +"images" "9" +"column.png" "10" +"column@2x.png" "10" +"grid.png" "10" +"grid@2x.png" "10" +"lower.png" "10" +"lower@2x.png" "10" +"raise.png" "10" +"raise@2x.png" "10" +"row.png" "10" +"row@2x.png" "10" +"componentcore_constants.h" "7" +"crumblebar.cpp" "7" +"crumblebar.h" "7" +"designeractionmanager.cpp" "7" +"designeractionmanager.h" "7" +"designeractionmanagerview.cpp" "7" +"designeractionmanagerview.h" "7" +"findimplementation.cpp" "7" +"findimplementation.h" "7" +"layoutingridlayout.cpp" "7" +"layoutingridlayout.h" "7" +"modelnodecontextmenu.cpp" "7" +"modelnodecontextmenu.h" "7" +"modelnodecontextmenu_helper.cpp" "7" +"modelnodecontextmenu_helper.h" "7" +"modelnodeoperations.cpp" "7" +"modelnodeoperations.h" "7" +"qmldesignericonprovider.cpp" "7" +"qmldesignericonprovider.h" "7" +"selectioncontext.cpp" "7" +"selectioncontext.h" "7" +"theme.cpp" "7" +"theme.h" "7" +"zoomaction.cpp" "7" +"zoomaction.h" "7" +"debugview" "6" +"debugview.cpp" "7" +"debugview.h" "7" +"debugviewwidget.cpp" "7" +"debugviewwidget.h" "7" +"debugviewwidget.ui" "7" +"formeditor" "6" +"abstractcustomtool.cpp" "7" +"abstractcustomtool.h" "7" +"abstractformeditortool.cpp" "7" +"abstractformeditortool.h" "7" +"anchorindicator.cpp" "7" +"anchorindicator.h" "7" +"anchorindicatorgraphicsitem.cpp" "7" +"anchorindicatorgraphicsitem.h" "7" +"backgroundaction.cpp" "7" +"backgroundaction.h" "7" +"bindingindicator.cpp" "7" +"bindingindicator.h" "7" +"bindingindicatorgraphicsitem.cpp" "7" +"bindingindicatorgraphicsitem.h" "7" +"contentnoteditableindicator.cpp" "7" +"contentnoteditableindicator.h" "7" +"controlelement.cpp" "7" +"controlelement.h" "7" +"dragtool.cpp" "7" +"dragtool.h" "7" +"formeditor.qrc" "7" +"/icon/layout" "8" +"no_snapping.png" "9" +"no_snapping@2x.png" "9" +"snapping.png" "9" +"snapping@2x.png" "9" +"snapping_and_anchoring.png" "9" +"snapping_and_anchoring@2x.png" "9" +"formeditorgraphicsview.cpp" "7" +"formeditorgraphicsview.h" "7" +"formeditoritem.cpp" "7" +"formeditoritem.h" "7" +"formeditorscene.cpp" "7" +"formeditorscene.h" "7" +"formeditortoolbutton.cpp" "7" +"formeditortoolbutton.h" "7" +"formeditorview.cpp" "7" +"formeditorview.h" "7" +"formeditorwidget.cpp" "7" +"formeditorwidget.h" "7" +"itemutilfunctions.cpp" "7" +"itemutilfunctions.h" "7" +"layeritem.cpp" "7" +"layeritem.h" "7" +"lineeditaction.cpp" "7" +"lineeditaction.h" "7" +"movemanipulator.cpp" "7" +"movemanipulator.h" "7" +"movetool.cpp" "7" +"movetool.h" "7" +"numberseriesaction.cpp" "7" +"numberseriesaction.h" "7" +"onedimensionalcluster.cpp" "7" +"onedimensionalcluster.h" "7" +"resizecontroller.cpp" "7" +"resizecontroller.h" "7" +"resizehandleitem.cpp" "7" +"resizehandleitem.h" "7" +"resizeindicator.cpp" "7" +"resizeindicator.h" "7" +"resizemanipulator.cpp" "7" +"resizemanipulator.h" "7" +"resizetool.cpp" "7" +"resizetool.h" "7" +"rubberbandselectionmanipulator.cpp" "7" +"rubberbandselectionmanipulator.h" "7" +"scaleitem.cpp" "7" +"scaleitem.h" "7" +"scalemanipulator.cpp" "7" +"scalemanipulator.h" "7" +"selectionindicator.cpp" "7" +"selectionindicator.h" "7" +"selectionrectangle.cpp" "7" +"selectionrectangle.h" "7" +"selectiontool.cpp" "7" +"selectiontool.h" "7" +"singleselectionmanipulator.cpp" "7" +"singleselectionmanipulator.h" "7" +"snapper.cpp" "7" +"snapper.h" "7" +"snappinglinecreator.cpp" "7" +"snappinglinecreator.h" "7" +"toolbox.cpp" "7" +"toolbox.h" "7" +"importmanager" "6" +"importlabel.cpp" "7" +"importlabel.h" "7" +"importmanager.css" "7" +"importmanager.qrc" "7" +"/importmanager" "8" +"importmanager.css" "9" +"importmanagercombobox.cpp" "7" +"importmanagercombobox.h" "7" +"importmanagerview.cpp" "7" +"importmanagerview.h" "7" +"importswidget.cpp" "7" +"importswidget.h" "7" +"integration" "6" +"componentaction.cpp" "7" +"componentaction.h" "7" +"componentview.cpp" "7" +"componentview.h" "7" +"designdocument.cpp" "7" +"designdocument.h" "7" +"designdocumentview.cpp" "7" +"designdocumentview.h" "7" +"stackedutilitypanelcontroller.cpp" "7" +"stackedutilitypanelcontroller.h" "7" +"utilitypanelcontroller.cpp" "7" +"utilitypanelcontroller.h" "7" +"itemlibrary" "6" +"customfilesystemmodel.cpp" "7" +"customfilesystemmodel.h" "7" +"itemlibrary.qrc" "7" +"/ItemLibrary" "8" +"images" "9" +"item-default-icon.png" "10" +"item-invalid-icon.png" "10" +"itemlibraryimageprovider.cpp" "7" +"itemlibraryimageprovider.h" "7" +"itemlibraryitem.cpp" "7" +"itemlibraryitem.h" "7" +"itemlibrarymodel.cpp" "7" +"itemlibrarymodel.h" "7" +"itemlibraryresourceview.cpp" "7" +"itemlibraryresourceview.h" "7" +"itemlibrarysection.cpp" "7" +"itemlibrarysection.h" "7" +"itemlibrarysectionmodel.cpp" "7" +"itemlibrarysectionmodel.h" "7" +"itemlibraryview.cpp" "7" +"itemlibraryview.h" "7" +"itemlibrarywidget.cpp" "7" +"itemlibrarywidget.h" "7" +"navigator" "6" +"iconcheckboxitemdelegate.cpp" "7" +"iconcheckboxitemdelegate.h" "7" +"nameitemdelegate.cpp" "7" +"nameitemdelegate.h" "7" +"navigator.qrc" "7" +"/navigator/icon" "8" +"arrowdown.png" "9" +"arrowdown@2x.png" "9" +"arrowleft.png" "9" +"arrowleft@2x.png" "9" +"arrowright.png" "9" +"arrowright@2x.png" "9" +"arrowup.png" "9" +"arrowup@2x.png" "9" +"export_checked.png" "9" +"export_checked@2x.png" "9" +"export_unchecked.png" "9" +"export_unchecked@2x.png" "9" +"navigatortreemodel.cpp" "7" +"navigatortreemodel.h" "7" +"navigatortreeview.cpp" "7" +"navigatortreeview.h" "7" +"navigatorview.cpp" "7" +"navigatorview.h" "7" +"navigatorwidget.cpp" "7" +"navigatorwidget.h" "7" +"propertyeditor" "6" +"designerpropertymap.cpp" "7" +"designerpropertymap.h" "7" +"fileresourcesmodel.cpp" "7" +"fileresourcesmodel.h" "7" +"gradientmodel.cpp" "7" +"gradientmodel.h" "7" +"propertyeditorcontextobject.cpp" "7" +"propertyeditorcontextobject.h" "7" +"propertyeditorqmlbackend.cpp" "7" +"propertyeditorqmlbackend.h" "7" +"propertyeditortransaction.cpp" "7" +"propertyeditortransaction.h" "7" +"propertyeditorvalue.cpp" "7" +"propertyeditorvalue.h" "7" +"propertyeditorview.cpp" "7" +"propertyeditorview.h" "7" +"propertyeditorwidget.cpp" "7" +"propertyeditorwidget.h" "7" +"qmlanchorbindingproxy.cpp" "7" +"qmlanchorbindingproxy.h" "7" +"qmlmodelnodeproxy.cpp" "7" +"qmlmodelnodeproxy.h" "7" +"quick2propertyeditorview.cpp" "7" +"quick2propertyeditorview.h" "7" +"resources" "6" +"resources.qrc" "7" +"/qmldesigner" "8" +"images" "9" +"spliteditorhorizontally.png" "10" +"spliteditorhorizontally@2x.png" "10" +"spliteditorvertically.png" "10" +"spliteditorvertically@2x.png" "10" +"centerwidget.css" "9" +"formeditorstylesheet.css" "9" +"scrollbar.css" "9" +"stylesheet.css" "9" +"stateseditor" "6" +"stateseditorimageprovider.cpp" "7" +"stateseditorimageprovider.h" "7" +"stateseditormodel.cpp" "7" +"stateseditormodel.h" "7" +"stateseditorview.cpp" "7" +"stateseditorview.h" "7" +"stateseditorwidget.cpp" "7" +"stateseditorwidget.h" "7" +"texteditor" "6" +"texteditorstatusbar.cpp" "7" +"texteditorstatusbar.h" "7" +"texteditorview.cpp" "7" +"texteditorview.h" "7" +"texteditorwidget.cpp" "7" +"texteditorwidget.h" "7" "PluginMetaData" "5" "QtcPlugin.qbs:49" "6" -"QmlDesigner.json.in" "7" +"QmlDesigner.json.in" "6" "SharedMemory (Generic)" "5" "qmldesignerplugin.qbs:203" "6" "sharedmemory_qt.cpp" "7" @@ -10328,276 +10338,276 @@ "qmldesignerplugin.qbs:7" "5" "Group 1" "5" "QtcDevHeaders.qbs:10" "6" -"components" "7" -"componentcore" "8" -"abstractaction.h" "9" -"abstractactiongroup.h" "9" -"actioninterface.h" "9" -"addimagesdialog.h" "9" -"addsignalhandlerdialog.h" "9" -"changestyleaction.h" "9" -"componentcore_constants.h" "9" -"crumblebar.h" "9" -"designeractionmanager.h" "9" -"designeractionmanagerview.h" "9" -"findimplementation.h" "9" -"layoutingridlayout.h" "9" -"modelnodecontextmenu.h" "9" -"modelnodecontextmenu_helper.h" "9" -"modelnodeoperations.h" "9" -"qmldesignericonprovider.h" "9" -"selectioncontext.h" "9" -"theme.h" "9" -"zoomaction.h" "9" -"debugview" "8" -"debugview.h" "9" -"debugviewwidget.h" "9" -"formeditor" "8" -"abstractcustomtool.h" "9" -"abstractformeditortool.h" "9" -"anchorindicator.h" "9" -"anchorindicatorgraphicsitem.h" "9" -"backgroundaction.h" "9" -"bindingindicator.h" "9" -"bindingindicatorgraphicsitem.h" "9" -"contentnoteditableindicator.h" "9" -"controlelement.h" "9" -"dragtool.h" "9" -"formeditorgraphicsview.h" "9" -"formeditoritem.h" "9" -"formeditorscene.h" "9" -"formeditorsubwindow.h" "9" -"formeditortoolbutton.h" "9" -"formeditorview.h" "9" -"formeditorwidget.h" "9" -"itemutilfunctions.h" "9" -"layeritem.h" "9" -"lineeditaction.h" "9" -"movemanipulator.h" "9" -"movetool.h" "9" -"numberseriesaction.h" "9" -"onedimensionalcluster.h" "9" -"resizecontroller.h" "9" -"resizehandleitem.h" "9" -"resizeindicator.h" "9" -"resizemanipulator.h" "9" -"resizetool.h" "9" -"rubberbandselectionmanipulator.h" "9" -"scaleitem.h" "9" -"scalemanipulator.h" "9" -"selectionindicator.h" "9" -"selectionrectangle.h" "9" -"selectiontool.h" "9" -"singleselectionmanipulator.h" "9" -"snapper.h" "9" -"snappinglinecreator.h" "9" -"toolbox.h" "9" -"importmanager" "8" -"importlabel.h" "9" -"importmanagercombobox.h" "9" -"importmanagerview.h" "9" -"importswidget.h" "9" -"integration" "8" -"componentaction.h" "9" -"componentview.h" "9" -"designdocument.h" "9" -"designdocumentview.h" "9" -"stackedutilitypanelcontroller.h" "9" -"utilitypanelcontroller.h" "9" -"itemlibrary" "8" -"customfilesystemmodel.h" "9" -"itemlibraryimageprovider.h" "9" -"itemlibraryitem.h" "9" -"itemlibrarymodel.h" "9" -"itemlibraryresourceview.h" "9" -"itemlibrarysection.h" "9" -"itemlibrarysectionmodel.h" "9" -"itemlibraryview.h" "9" -"itemlibrarywidget.h" "9" -"navigator" "8" -"iconcheckboxitemdelegate.h" "9" -"nameitemdelegate.h" "9" -"navigatormodelinterface.h" "9" -"navigatortreemodel.h" "9" -"navigatortreeview.h" "9" -"navigatorview.h" "9" -"navigatorwidget.h" "9" -"propertyeditor" "8" -"designerpropertymap.h" "9" -"fileresourcesmodel.h" "9" -"gradientmodel.h" "9" -"propertyeditorcontextobject.h" "9" -"propertyeditorqmlbackend.h" "9" -"propertyeditortransaction.h" "9" -"propertyeditorvalue.h" "9" -"propertyeditorview.h" "9" -"propertyeditorwidget.h" "9" -"qmlanchorbindingproxy.h" "9" -"qmlmodelnodeproxy.h" "9" -"quick2propertyeditorview.h" "9" -"stateseditor" "8" -"stateseditorimageprovider.h" "9" -"stateseditormodel.h" "9" -"stateseditorview.h" "9" -"stateseditorwidget.h" "9" -"texteditor" "8" -"texteditorstatusbar.h" "9" -"texteditorview.h" "9" -"texteditorwidget.h" "9" -"componentsplugin" "7" -"addtabdesigneraction.h" "8" -"addtabtotabviewdialog.h" "8" -"componentsplugin.h" "8" -"entertabdesigneraction.h" "8" -"tabviewindexmodel.h" "8" -"designercore" "7" -"filemanager" "8" -"addarraymembervisitor.h" "9" -"addobjectvisitor.h" "9" -"addpropertyvisitor.h" "9" -"astobjecttextextractor.h" "9" -"changeimportsvisitor.h" "9" -"changeobjecttypevisitor.h" "9" -"changepropertyvisitor.h" "9" -"firstdefinitionfinder.h" "9" -"moveobjectbeforeobjectvisitor.h" "9" -"moveobjectvisitor.h" "9" -"objectlengthcalculator.h" "9" -"qmlrefactoring.h" "9" -"qmlrewriter.h" "9" -"removepropertyvisitor.h" "9" -"removeuiobjectmembervisitor.h" "9" -"include" "8" -"abstractproperty.h" "9" -"abstractview.h" "9" -"anchorline.h" "9" -"basetexteditmodifier.h" "9" -"bindingproperty.h" "9" -"bytearraymodifier.h" "9" -"componenttextmodifier.h" "9" -"customnotifications.h" "9" -"documentmessage.h" "9" -"exception.h" "9" -"forwardview.h" "9" -"import.h" "9" -"invalidargumentexception.h" "9" -"invalididexception.h" "9" -"invalidmetainfoexception.h" "9" -"invalidmodelnodeexception.h" "9" -"invalidmodelstateexception.h" "9" -"invalidpropertyexception.h" "9" -"invalidqmlsourceexception.h" "9" -"invalidreparentingexception.h" "9" -"invalidslideindexexception.h" "9" -"itemlibraryinfo.h" "9" -"iwidgetplugin.h" "9" -"mathutils.h" "9" -"metainfo.h" "9" -"metainforeader.h" "9" -"model.h" "9" -"modelmerger.h" "9" -"modelnode.h" "9" -"modelnodepositionstorage.h" "9" -"modificationgroupexception.h" "9" -"modificationgrouptoken.h" "9" -"nodeabstractproperty.h" "9" -"nodeanchors.h" "9" -"nodehints.h" "9" -"nodeinstance.h" "9" -"nodeinstanceview.h" "9" -"nodelistproperty.h" "9" -"nodemetainfo.h" "9" -"nodeproperty.h" "9" -"notimplementedexception.h" "9" -"objectpropertybinding.h" "9" -"plaintexteditmodifier.h" "9" -"propertybinding.h" "9" -"propertycontainer.h" "9" -"propertynode.h" "9" -"propertyparser.h" "9" -"qmlanchors.h" "9" -"qmlchangeset.h" "9" -"qmldesignercorelib_global.h" "9" -"qmlitemnode.h" "9" -"qmlmodelnodefacade.h" "9" -"qmlobjectnode.h" "9" -"qmlstate.h" "9" -"qmltimeline.h" "9" -"qmltimelinekeyframegroup.h" "9" -"removebasestateexception.h" "9" -"rewriterview.h" "9" -"rewritingexception.h" "9" -"signalhandlerproperty.h" "9" -"subcomponentmanager.h" "9" -"textmodifier.h" "9" -"variantproperty.h" "9" -"viewmanager.h" "9" -"instances" "8" -"nodeinstanceserverproxy.h" "9" -"puppetbuildprogressdialog.h" "9" -"puppetcreator.h" "9" -"puppetdialog.h" "9" -"model" "8" -"internalbindingproperty.h" "9" -"internalnode_p.h" "9" -"internalnodeabstractproperty.h" "9" -"internalnodelistproperty.h" "9" -"internalnodeproperty.h" "9" -"internalproperty.h" "9" -"internalsignalhandlerproperty.h" "9" -"internalvariantproperty.h" "9" -"model_p.h" "9" -"modelnodepositionrecalculator.h" "9" -"modeltotextmerger.h" "9" -"qmltextgenerator.h" "9" -"rewriteaction.h" "9" -"rewriteactioncompressor.h" "9" -"texttomodelmerger.h" "9" -"pluginmanager" "8" -"widgetpluginmanager.h" "9" -"widgetpluginpath.h" "9" -"rewritertransaction.h" "8" -"qmldesignerextension" "7" -"colortool" "8" -"colortool.h" "9" -"connectioneditor" "8" -"addnewbackenddialog.h" "9" -"backendmodel.h" "9" -"bindingmodel.h" "9" -"connectionmodel.h" "9" -"connectionview.h" "9" -"connectionviewwidget.h" "9" -"delegates.h" "9" -"dynamicpropertiesmodel.h" "9" -"pathtool" "8" -"controlpoint.h" "9" -"cubicsegment.h" "9" -"pathitem.h" "9" -"pathselectionmanipulator.h" "9" -"pathtool.h" "9" -"pathtoolview.h" "9" -"sourcetool" "8" -"sourcetool.h" "9" -"texttool" "8" -"textedititem.h" "9" -"textedititemwidget.h" "9" -"texttool.h" "9" -"qmldesignerextension_global.h" "8" -"qmldesignerextensionconstants.h" "8" -"qtquickplugin" "7" -"qtquickplugin.h" "8" -"designersettings.h" "7" -"designmodecontext.h" "7" -"designmodewidget.h" "7" -"documentmanager.h" "7" -"documentwarningwidget.h" "7" -"openuiqmlfiledialog.h" "7" -"qmldesignerconstants.h" "7" -"qmldesignericons.h" "7" -"qmldesignerplugin.h" "7" -"settingspage.h" "7" -"shortcutmanager.h" "7" -"switchsplittabwidget.h" "7" +"components" "6" +"componentcore" "7" +"abstractaction.h" "8" +"abstractactiongroup.h" "8" +"actioninterface.h" "8" +"addimagesdialog.h" "8" +"addsignalhandlerdialog.h" "8" +"changestyleaction.h" "8" +"componentcore_constants.h" "8" +"crumblebar.h" "8" +"designeractionmanager.h" "8" +"designeractionmanagerview.h" "8" +"findimplementation.h" "8" +"layoutingridlayout.h" "8" +"modelnodecontextmenu.h" "8" +"modelnodecontextmenu_helper.h" "8" +"modelnodeoperations.h" "8" +"qmldesignericonprovider.h" "8" +"selectioncontext.h" "8" +"theme.h" "8" +"zoomaction.h" "8" +"debugview" "7" +"debugview.h" "8" +"debugviewwidget.h" "8" +"formeditor" "7" +"abstractcustomtool.h" "8" +"abstractformeditortool.h" "8" +"anchorindicator.h" "8" +"anchorindicatorgraphicsitem.h" "8" +"backgroundaction.h" "8" +"bindingindicator.h" "8" +"bindingindicatorgraphicsitem.h" "8" +"contentnoteditableindicator.h" "8" +"controlelement.h" "8" +"dragtool.h" "8" +"formeditorgraphicsview.h" "8" +"formeditoritem.h" "8" +"formeditorscene.h" "8" +"formeditorsubwindow.h" "8" +"formeditortoolbutton.h" "8" +"formeditorview.h" "8" +"formeditorwidget.h" "8" +"itemutilfunctions.h" "8" +"layeritem.h" "8" +"lineeditaction.h" "8" +"movemanipulator.h" "8" +"movetool.h" "8" +"numberseriesaction.h" "8" +"onedimensionalcluster.h" "8" +"resizecontroller.h" "8" +"resizehandleitem.h" "8" +"resizeindicator.h" "8" +"resizemanipulator.h" "8" +"resizetool.h" "8" +"rubberbandselectionmanipulator.h" "8" +"scaleitem.h" "8" +"scalemanipulator.h" "8" +"selectionindicator.h" "8" +"selectionrectangle.h" "8" +"selectiontool.h" "8" +"singleselectionmanipulator.h" "8" +"snapper.h" "8" +"snappinglinecreator.h" "8" +"toolbox.h" "8" +"importmanager" "7" +"importlabel.h" "8" +"importmanagercombobox.h" "8" +"importmanagerview.h" "8" +"importswidget.h" "8" +"integration" "7" +"componentaction.h" "8" +"componentview.h" "8" +"designdocument.h" "8" +"designdocumentview.h" "8" +"stackedutilitypanelcontroller.h" "8" +"utilitypanelcontroller.h" "8" +"itemlibrary" "7" +"customfilesystemmodel.h" "8" +"itemlibraryimageprovider.h" "8" +"itemlibraryitem.h" "8" +"itemlibrarymodel.h" "8" +"itemlibraryresourceview.h" "8" +"itemlibrarysection.h" "8" +"itemlibrarysectionmodel.h" "8" +"itemlibraryview.h" "8" +"itemlibrarywidget.h" "8" +"navigator" "7" +"iconcheckboxitemdelegate.h" "8" +"nameitemdelegate.h" "8" +"navigatormodelinterface.h" "8" +"navigatortreemodel.h" "8" +"navigatortreeview.h" "8" +"navigatorview.h" "8" +"navigatorwidget.h" "8" +"propertyeditor" "7" +"designerpropertymap.h" "8" +"fileresourcesmodel.h" "8" +"gradientmodel.h" "8" +"propertyeditorcontextobject.h" "8" +"propertyeditorqmlbackend.h" "8" +"propertyeditortransaction.h" "8" +"propertyeditorvalue.h" "8" +"propertyeditorview.h" "8" +"propertyeditorwidget.h" "8" +"qmlanchorbindingproxy.h" "8" +"qmlmodelnodeproxy.h" "8" +"quick2propertyeditorview.h" "8" +"stateseditor" "7" +"stateseditorimageprovider.h" "8" +"stateseditormodel.h" "8" +"stateseditorview.h" "8" +"stateseditorwidget.h" "8" +"texteditor" "7" +"texteditorstatusbar.h" "8" +"texteditorview.h" "8" +"texteditorwidget.h" "8" +"componentsplugin" "6" +"addtabdesigneraction.h" "7" +"addtabtotabviewdialog.h" "7" +"componentsplugin.h" "7" +"entertabdesigneraction.h" "7" +"tabviewindexmodel.h" "7" +"designercore" "6" +"filemanager" "7" +"addarraymembervisitor.h" "8" +"addobjectvisitor.h" "8" +"addpropertyvisitor.h" "8" +"astobjecttextextractor.h" "8" +"changeimportsvisitor.h" "8" +"changeobjecttypevisitor.h" "8" +"changepropertyvisitor.h" "8" +"firstdefinitionfinder.h" "8" +"moveobjectbeforeobjectvisitor.h" "8" +"moveobjectvisitor.h" "8" +"objectlengthcalculator.h" "8" +"qmlrefactoring.h" "8" +"qmlrewriter.h" "8" +"removepropertyvisitor.h" "8" +"removeuiobjectmembervisitor.h" "8" +"include" "7" +"abstractproperty.h" "8" +"abstractview.h" "8" +"anchorline.h" "8" +"basetexteditmodifier.h" "8" +"bindingproperty.h" "8" +"bytearraymodifier.h" "8" +"componenttextmodifier.h" "8" +"customnotifications.h" "8" +"documentmessage.h" "8" +"exception.h" "8" +"forwardview.h" "8" +"import.h" "8" +"invalidargumentexception.h" "8" +"invalididexception.h" "8" +"invalidmetainfoexception.h" "8" +"invalidmodelnodeexception.h" "8" +"invalidmodelstateexception.h" "8" +"invalidpropertyexception.h" "8" +"invalidqmlsourceexception.h" "8" +"invalidreparentingexception.h" "8" +"invalidslideindexexception.h" "8" +"itemlibraryinfo.h" "8" +"iwidgetplugin.h" "8" +"mathutils.h" "8" +"metainfo.h" "8" +"metainforeader.h" "8" +"model.h" "8" +"modelmerger.h" "8" +"modelnode.h" "8" +"modelnodepositionstorage.h" "8" +"modificationgroupexception.h" "8" +"modificationgrouptoken.h" "8" +"nodeabstractproperty.h" "8" +"nodeanchors.h" "8" +"nodehints.h" "8" +"nodeinstance.h" "8" +"nodeinstanceview.h" "8" +"nodelistproperty.h" "8" +"nodemetainfo.h" "8" +"nodeproperty.h" "8" +"notimplementedexception.h" "8" +"objectpropertybinding.h" "8" +"plaintexteditmodifier.h" "8" +"propertybinding.h" "8" +"propertycontainer.h" "8" +"propertynode.h" "8" +"propertyparser.h" "8" +"qmlanchors.h" "8" +"qmlchangeset.h" "8" +"qmldesignercorelib_global.h" "8" +"qmlitemnode.h" "8" +"qmlmodelnodefacade.h" "8" +"qmlobjectnode.h" "8" +"qmlstate.h" "8" +"qmltimeline.h" "8" +"qmltimelinekeyframegroup.h" "8" +"removebasestateexception.h" "8" +"rewriterview.h" "8" +"rewritingexception.h" "8" +"signalhandlerproperty.h" "8" +"subcomponentmanager.h" "8" +"textmodifier.h" "8" +"variantproperty.h" "8" +"viewmanager.h" "8" +"instances" "7" +"nodeinstanceserverproxy.h" "8" +"puppetbuildprogressdialog.h" "8" +"puppetcreator.h" "8" +"puppetdialog.h" "8" +"model" "7" +"internalbindingproperty.h" "8" +"internalnode_p.h" "8" +"internalnodeabstractproperty.h" "8" +"internalnodelistproperty.h" "8" +"internalnodeproperty.h" "8" +"internalproperty.h" "8" +"internalsignalhandlerproperty.h" "8" +"internalvariantproperty.h" "8" +"model_p.h" "8" +"modelnodepositionrecalculator.h" "8" +"modeltotextmerger.h" "8" +"qmltextgenerator.h" "8" +"rewriteaction.h" "8" +"rewriteactioncompressor.h" "8" +"texttomodelmerger.h" "8" +"pluginmanager" "7" +"widgetpluginmanager.h" "8" +"widgetpluginpath.h" "8" +"rewritertransaction.h" "7" +"qmldesignerextension" "6" +"colortool" "7" +"colortool.h" "8" +"connectioneditor" "7" +"addnewbackenddialog.h" "8" +"backendmodel.h" "8" +"bindingmodel.h" "8" +"connectionmodel.h" "8" +"connectionview.h" "8" +"connectionviewwidget.h" "8" +"delegates.h" "8" +"dynamicpropertiesmodel.h" "8" +"pathtool" "7" +"controlpoint.h" "8" +"cubicsegment.h" "8" +"pathitem.h" "8" +"pathselectionmanipulator.h" "8" +"pathtool.h" "8" +"pathtoolview.h" "8" +"sourcetool" "7" +"sourcetool.h" "8" +"texttool" "7" +"textedititem.h" "8" +"textedititemwidget.h" "8" +"texttool.h" "8" +"qmldesignerextension_global.h" "7" +"qmldesignerextensionconstants.h" "7" +"qtquickplugin" "6" +"qtquickplugin.h" "7" +"designersettings.h" "6" +"designmodecontext.h" "6" +"designmodewidget.h" "6" +"documentmanager.h" "6" +"documentwarningwidget.h" "6" +"openuiqmlfiledialog.h" "6" +"qmldesignerconstants.h" "6" +"qmldesignericons.h" "6" +"qmldesignerplugin.h" "6" +"settingspage.h" "6" +"shortcutmanager.h" "6" +"switchsplittabwidget.h" "6" "qtquickplugin" "3" "qtquickplugin.qbs:3" "4" "images" "4" @@ -10717,7 +10727,7 @@ "qmljseditor.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"QmlJSEditor.json.in" "5" +"QmlJSEditor.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -10784,7 +10794,7 @@ "qmljstools.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"QmlJSTools.json.in" "5" +"QmlJSTools.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -10913,15 +10923,14 @@ "scenegraphtimelinemodel.h" "4" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"QmlProfiler.json.in" "5" +"QmlProfiler.json.in" "4" "QML" "3" "qmlprofiler.qbs:68" "4" -"qml" "4" -"qmlprofiler.qrc" "5" -"/qmlprofiler" "6" -"bindingloops.frag" "7" -"bindingloops.vert" "7" -"QmlProfilerFlameGraphView.qml" "7" +"qmlprofiler.qrc" "4" +"/qmlprofiler" "5" +"bindingloops.frag" "6" +"bindingloops.vert" "6" +"QmlProfilerFlameGraphView.qml" "6" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -10930,66 +10939,64 @@ "qtcreator_pch.h" "5" "Unit tests" "3" "qmlprofiler.qbs:74" "4" -"tests" "4" -"debugmessagesmodel_test.cpp" "5" -"debugmessagesmodel_test.h" "5" -"fakedebugserver.cpp" "5" -"fakedebugserver.h" "5" -"flamegraphmodel_test.cpp" "5" -"flamegraphmodel_test.h" "5" -"flamegraphview_test.cpp" "5" -"flamegraphview_test.h" "5" -"inputeventsmodel_test.cpp" "5" -"inputeventsmodel_test.h" "5" -"localqmlprofilerrunner_test.cpp" "5" -"localqmlprofilerrunner_test.h" "5" -"memoryusagemodel_test.cpp" "5" -"memoryusagemodel_test.h" "5" -"pixmapcachemodel_test.cpp" "5" -"pixmapcachemodel_test.h" "5" -"qmlevent_test.cpp" "5" -"qmlevent_test.h" "5" -"qmleventlocation_test.cpp" "5" -"qmleventlocation_test.h" "5" -"qmleventtype_test.cpp" "5" -"qmleventtype_test.h" "5" -"qmlnote_test.cpp" "5" -"qmlnote_test.h" "5" -"qmlprofileranimationsmodel_test.cpp" "5" -"qmlprofileranimationsmodel_test.h" "5" -"qmlprofilerattachdialog_test.cpp" "5" -"qmlprofilerattachdialog_test.h" "5" -"qmlprofilerbindingloopsrenderpass_test.cpp" "5" -"qmlprofilerbindingloopsrenderpass_test.h" "5" -"qmlprofilerclientmanager_test.cpp" "5" -"qmlprofilerclientmanager_test.h" "5" -"qmlprofilerconfigwidget_test.cpp" "5" -"qmlprofilerconfigwidget_test.h" "5" -"qmlprofilerdetailsrewriter_test.cpp" "5" -"qmlprofilerdetailsrewriter_test.h" "5" -"qmlprofilertool_test.cpp" "5" -"qmlprofilertool_test.h" "5" -"qmlprofilertraceclient_test.cpp" "5" -"qmlprofilertraceclient_test.h" "5" -"qmlprofilertraceview_test.cpp" "5" -"qmlprofilertraceview_test.h" "5" -"tests.qrc" "5" -"/qmlprofiler/tests" "6" -"check.dat" "7" -"qmlprofilerdetailsrewriter_test.cpp" "7" -"Test.qml" "7" -"traces.dat" "7" +"debugmessagesmodel_test.cpp" "4" +"debugmessagesmodel_test.h" "4" +"fakedebugserver.cpp" "4" +"fakedebugserver.h" "4" +"flamegraphmodel_test.cpp" "4" +"flamegraphmodel_test.h" "4" +"flamegraphview_test.cpp" "4" +"flamegraphview_test.h" "4" +"inputeventsmodel_test.cpp" "4" +"inputeventsmodel_test.h" "4" +"localqmlprofilerrunner_test.cpp" "4" +"localqmlprofilerrunner_test.h" "4" +"memoryusagemodel_test.cpp" "4" +"memoryusagemodel_test.h" "4" +"pixmapcachemodel_test.cpp" "4" +"pixmapcachemodel_test.h" "4" +"qmlevent_test.cpp" "4" +"qmlevent_test.h" "4" +"qmleventlocation_test.cpp" "4" +"qmleventlocation_test.h" "4" +"qmleventtype_test.cpp" "4" +"qmleventtype_test.h" "4" +"qmlnote_test.cpp" "4" +"qmlnote_test.h" "4" +"qmlprofileranimationsmodel_test.cpp" "4" +"qmlprofileranimationsmodel_test.h" "4" +"qmlprofilerattachdialog_test.cpp" "4" +"qmlprofilerattachdialog_test.h" "4" +"qmlprofilerbindingloopsrenderpass_test.cpp" "4" +"qmlprofilerbindingloopsrenderpass_test.h" "4" +"qmlprofilerclientmanager_test.cpp" "4" +"qmlprofilerclientmanager_test.h" "4" +"qmlprofilerconfigwidget_test.cpp" "4" +"qmlprofilerconfigwidget_test.h" "4" +"qmlprofilerdetailsrewriter_test.cpp" "4" +"qmlprofilerdetailsrewriter_test.h" "4" +"qmlprofilertool_test.cpp" "4" +"qmlprofilertool_test.h" "4" +"qmlprofilertraceclient_test.cpp" "4" +"qmlprofilertraceclient_test.h" "4" +"qmlprofilertraceview_test.cpp" "4" +"qmlprofilertraceview_test.h" "4" +"tests.qrc" "4" +"/qmlprofiler/tests" "5" +"check.dat" "6" +"qmlprofilerdetailsrewriter_test.cpp" "6" +"Test.qml" "6" +"traces.dat" "6" "QmlProjectManager" "2" "qmlprojectmanager.qbs:3" "3" "File Format" "3" "qmlprojectmanager.qbs:30" "4" -"fileformat" "4" -"filefilteritems.cpp" "5" -"filefilteritems.h" "5" -"qmlprojectfileformat.cpp" "5" -"qmlprojectfileformat.h" "5" -"qmlprojectitem.cpp" "5" -"qmlprojectitem.h" "5" +"filefilteritems.cpp" "4" +"filefilteritems.h" "4" +"qmlprojectfileformat.cpp" "4" +"qmlprojectfileformat.h" "4" +"qmlprojectitem.cpp" "4" +"qmlprojectitem.h" "4" "General" "3" "qmlprojectmanager.qbs:14" "4" "qmlproject.cpp" "4" @@ -11013,7 +11020,7 @@ "qmlprojectrunconfigurationwidget.h" "4" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"QmlProjectManager.json.in" "5" +"QmlProjectManager.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -11024,7 +11031,7 @@ "qnx.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"Qnx.json.in" "5" +"Qnx.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -11102,34 +11109,34 @@ "gettingstartedwelcomepage.h" "5" "PluginMetaData" "4" "QtcPlugin.qbs:49" "5" -"QtSupport.json.in" "6" +"QtSupport.json.in" "5" "Pro Parser" "4" "qtsupport.qbs:26" "5" -"ioutils.cpp" "6" -"ioutils.h" "6" -"profileevaluator.cpp" "6" -"profileevaluator.h" "6" -"proitems.cpp" "6" -"proitems.h" "6" -"proparser.qrc" "6" -"/qmake/features" "7" -"spec_post.prf" "8" -"spec_pre.prf" "8" -"/qmake/override_features" "7" -"objective_c.prf" "8" -"prowriter.cpp" "6" -"prowriter.h" "6" -"qmake_global.h" "6" -"qmakebuiltins.cpp" "6" -"qmakeevaluator.cpp" "6" -"qmakeevaluator.h" "6" -"qmakeevaluator_p.h" "6" -"qmakeglobals.cpp" "6" -"qmakeglobals.h" "6" -"qmakeparser.cpp" "6" -"qmakeparser.h" "6" -"qmakevfs.cpp" "6" -"qmakevfs.h" "6" +"ioutils.cpp" "5" +"ioutils.h" "5" +"profileevaluator.cpp" "5" +"profileevaluator.h" "5" +"proitems.cpp" "5" +"proitems.h" "5" +"proparser.qrc" "5" +"/qmake/features" "6" +"spec_post.prf" "7" +"spec_pre.prf" "7" +"/qmake/override_features" "6" +"objective_c.prf" "7" +"prowriter.cpp" "5" +"prowriter.h" "5" +"qmake_global.h" "5" +"qmakebuiltins.cpp" "5" +"qmakeevaluator.cpp" "5" +"qmakeevaluator.h" "5" +"qmakeevaluator_p.h" "5" +"qmakeglobals.cpp" "5" +"qmakeglobals.h" "5" +"qmakeparser.cpp" "5" +"qmakeparser.h" "5" +"qmakevfs.cpp" "5" +"qmakevfs.h" "5" "QtVersion" "4" "qtsupport.qbs:103" "5" "desktopqtversion.cpp" "5" @@ -11208,38 +11215,38 @@ "qtsupport.qbs:6" "4" "Group 1" "4" "QtcDevHeaders.qbs:10" "5" -"baseqtversion.h" "6" -"codegenerator.h" "6" -"codegensettings.h" "6" -"codegensettingspage.h" "6" -"desktopqtversion.h" "6" -"desktopqtversionfactory.h" "6" -"exampleslistmodel.h" "6" -"gettingstartedwelcomepage.h" "6" -"profilereader.h" "6" -"qmldumptool.h" "6" -"qscxmlcgenerator.h" "6" -"qtconfigwidget.h" "6" -"qtkitconfigwidget.h" "6" -"qtkitinformation.h" "6" -"qtoptionspage.h" "6" -"qtoutputformatter.h" "6" -"qtparser.h" "6" -"qtprojectimporter.h" "6" -"qtsupport_global.h" "6" -"qtsupportconstants.h" "6" -"qtsupportplugin.h" "6" -"qtversionfactory.h" "6" -"qtversionmanager.h" "6" -"screenshotcropper.h" "6" -"uicgenerator.h" "6" +"baseqtversion.h" "5" +"codegenerator.h" "5" +"codegensettings.h" "5" +"codegensettingspage.h" "5" +"desktopqtversion.h" "5" +"desktopqtversionfactory.h" "5" +"exampleslistmodel.h" "5" +"gettingstartedwelcomepage.h" "5" +"profilereader.h" "5" +"qmldumptool.h" "5" +"qscxmlcgenerator.h" "5" +"qtconfigwidget.h" "5" +"qtkitconfigwidget.h" "5" +"qtkitinformation.h" "5" +"qtoptionspage.h" "5" +"qtoutputformatter.h" "5" +"qtparser.h" "5" +"qtprojectimporter.h" "5" +"qtsupport_global.h" "5" +"qtsupportconstants.h" "5" +"qtsupportplugin.h" "5" +"qtversionfactory.h" "5" +"qtversionmanager.h" "5" +"screenshotcropper.h" "5" +"uicgenerator.h" "5" "RemoteLinux" "2" "remotelinux.qbs:3" "3" "RemoteLinux" "3" "remotelinux.qbs:8" "4" "PluginMetaData" "4" "QtcPlugin.qbs:49" "5" -"RemoteLinux.json.in" "6" +"RemoteLinux.json.in" "5" "standard pch file (gui)" "4" "QtcProduct.qbs:65" "5" "qtcreator_gui_pch.h" "6" @@ -11341,48 +11348,48 @@ "remotelinux.qbs:6" "4" "Group 1" "4" "QtcDevHeaders.qbs:10" "5" -"abstractpackagingstep.h" "6" -"abstractremotelinuxdeployservice.h" "6" -"abstractremotelinuxdeploystep.h" "6" -"abstractuploadandinstallpackageservice.h" "6" -"deploymenttimeinfo.h" "6" -"embeddedlinuxqtversion.h" "6" -"embeddedlinuxqtversionfactory.h" "6" -"genericdirectuploadservice.h" "6" -"genericdirectuploadstep.h" "6" -"genericlinuxdeviceconfigurationfactory.h" "6" -"genericlinuxdeviceconfigurationwidget.h" "6" -"genericlinuxdeviceconfigurationwizard.h" "6" -"genericlinuxdeviceconfigurationwizardpages.h" "6" -"linuxdevice.h" "6" -"linuxdeviceprocess.h" "6" -"linuxdevicetester.h" "6" -"packageuploader.h" "6" -"publickeydeploymentdialog.h" "6" -"remotelinux_constants.h" "6" -"remotelinux_export.h" "6" -"remotelinuxcheckforfreediskspaceservice.h" "6" -"remotelinuxcheckforfreediskspacestep.h" "6" -"remotelinuxcustomcommanddeploymentstep.h" "6" -"remotelinuxcustomcommanddeployservice.h" "6" -"remotelinuxcustomrunconfiguration.h" "6" -"remotelinuxdebugsupport.h" "6" -"remotelinuxdeployconfiguration.h" "6" -"remotelinuxenvironmentaspect.h" "6" -"remotelinuxenvironmentaspectwidget.h" "6" -"remotelinuxenvironmentreader.h" "6" -"remotelinuxkillappservice.h" "6" -"remotelinuxkillappstep.h" "6" -"remotelinuxpackageinstaller.h" "6" -"remotelinuxplugin.h" "6" -"remotelinuxqmltoolingsupport.h" "6" -"remotelinuxrunconfiguration.h" "6" -"remotelinuxsignaloperation.h" "6" -"remotelinuxutils.h" "6" -"sshkeydeployer.h" "6" -"tarpackagecreationstep.h" "6" -"typespecificdeviceconfigurationlistmodel.h" "6" -"uploadandinstalltarpackagestep.h" "6" +"abstractpackagingstep.h" "5" +"abstractremotelinuxdeployservice.h" "5" +"abstractremotelinuxdeploystep.h" "5" +"abstractuploadandinstallpackageservice.h" "5" +"deploymenttimeinfo.h" "5" +"embeddedlinuxqtversion.h" "5" +"embeddedlinuxqtversionfactory.h" "5" +"genericdirectuploadservice.h" "5" +"genericdirectuploadstep.h" "5" +"genericlinuxdeviceconfigurationfactory.h" "5" +"genericlinuxdeviceconfigurationwidget.h" "5" +"genericlinuxdeviceconfigurationwizard.h" "5" +"genericlinuxdeviceconfigurationwizardpages.h" "5" +"linuxdevice.h" "5" +"linuxdeviceprocess.h" "5" +"linuxdevicetester.h" "5" +"packageuploader.h" "5" +"publickeydeploymentdialog.h" "5" +"remotelinux_constants.h" "5" +"remotelinux_export.h" "5" +"remotelinuxcheckforfreediskspaceservice.h" "5" +"remotelinuxcheckforfreediskspacestep.h" "5" +"remotelinuxcustomcommanddeploymentstep.h" "5" +"remotelinuxcustomcommanddeployservice.h" "5" +"remotelinuxcustomrunconfiguration.h" "5" +"remotelinuxdebugsupport.h" "5" +"remotelinuxdeployconfiguration.h" "5" +"remotelinuxenvironmentaspect.h" "5" +"remotelinuxenvironmentaspectwidget.h" "5" +"remotelinuxenvironmentreader.h" "5" +"remotelinuxkillappservice.h" "5" +"remotelinuxkillappstep.h" "5" +"remotelinuxpackageinstaller.h" "5" +"remotelinuxplugin.h" "5" +"remotelinuxqmltoolingsupport.h" "5" +"remotelinuxrunconfiguration.h" "5" +"remotelinuxsignaloperation.h" "5" +"remotelinuxutils.h" "5" +"sshkeydeployer.h" "5" +"tarpackagecreationstep.h" "5" +"typespecificdeviceconfigurationlistmodel.h" "5" +"uploadandinstalltarpackagestep.h" "5" "ResourceEditor" "2" "resourceeditor.qbs:3" "3" "ResourceEditor" "3" @@ -11401,19 +11408,18 @@ "resourcenode.h" "5" "PluginMetaData" "4" "QtcPlugin.qbs:49" "5" -"ResourceEditor.json.in" "6" +"ResourceEditor.json.in" "5" "QRC Editor" "4" "resourceeditor.qbs:29" "5" -"qrceditor" "5" -"qrceditor.cpp" "6" -"qrceditor.h" "6" -"qrceditor.ui" "6" -"resourcefile.cpp" "6" -"resourcefile_p.h" "6" -"resourceview.cpp" "6" -"resourceview.h" "6" -"undocommands.cpp" "6" -"undocommands_p.h" "6" +"qrceditor.cpp" "5" +"qrceditor.h" "5" +"qrceditor.ui" "5" +"resourcefile.cpp" "5" +"resourcefile_p.h" "5" +"resourceview.cpp" "5" +"resourceview.h" "5" +"undocommands.cpp" "5" +"undocommands_p.h" "5" "standard pch file (gui)" "4" "QtcProduct.qbs:65" "5" "qtcreator_gui_pch.h" "6" @@ -11424,229 +11430,226 @@ "resourceeditor.qbs:6" "4" "Group 1" "4" "QtcDevHeaders.qbs:10" "5" -"qrceditor" "6" -"test" "7" -"mainwindow.h" "8" -"qrceditor.h" "7" -"resourcefile_p.h" "7" -"resourceview.h" "7" -"undocommands_p.h" "7" -"resource_global.h" "6" -"resourceeditorconstants.h" "6" -"resourceeditorfactory.h" "6" -"resourceeditorplugin.h" "6" -"resourceeditorw.h" "6" -"resourcenode.h" "6" +"qrceditor" "5" +"test" "6" +"mainwindow.h" "7" +"qrceditor.h" "6" +"resourcefile_p.h" "6" +"resourceview.h" "6" +"undocommands_p.h" "6" +"resource_global.h" "5" +"resourceeditorconstants.h" "5" +"resourceeditorfactory.h" "5" +"resourceeditorplugin.h" "5" +"resourceeditorw.h" "5" +"resourcenode.h" "5" "ScxmlEditor" "2" "scxmleditor.qbs:3" "3" "Common" "3" "scxmleditor.qbs:35" "4" -"common" "4" -"colorpicker.cpp" "5" -"colorpicker.h" "5" -"colorpicker.ui" "5" -"colorsettings.cpp" "5" -"colorsettings.h" "5" -"colorsettings.ui" "5" -"colorthemedialog.cpp" "5" -"colorthemedialog.h" "5" -"colorthemedialog.ui" "5" -"colorthemes.cpp" "5" -"colorthemes.h" "5" -"colorthemeview.cpp" "5" -"colorthemeview.h" "5" -"colortoolbutton.cpp" "5" -"colortoolbutton.h" "5" -"common.qrc" "5" -"/scxmleditor" "6" -"images" "7" -"adjust_height.png" "8" -"adjust_height@2x.png" "8" -"adjust_size.png" "8" -"adjust_size@2x.png" "8" -"adjust_width.png" "8" -"adjust_width@2x.png" "8" -"align_bottom.png" "8" -"align_bottom@2x.png" "8" -"align_horizontal.png" "8" -"align_horizontal@2x.png" "8" -"align_left.png" "8" -"align_left@2x.png" "8" -"align_right.png" "8" -"align_right@2x.png" "8" -"align_top.png" "8" -"align_top@2x.png" "8" -"align_vertical.png" "8" -"align_vertical@2x.png" "8" -"colorthemes.png" "8" -"final.png" "8" -"font_color.png" "8" -"history.png" "8" -"icon-export-canvas.png" "8" -"icon-export-canvas@2x.png" "8" -"initial.png" "8" -"more_colors.png" "8" -"navigator.png" "8" -"parallel.png" "8" -"parallel_icon.png" "8" -"state.png" "8" -"state_color.png" "8" -"statistics.png" "8" -"dragshapebutton.cpp" "5" -"dragshapebutton.h" "5" -"graphicsview.cpp" "5" -"graphicsview.h" "5" -"magnifier.cpp" "5" -"magnifier.h" "5" -"magnifier.ui" "5" -"mainwidget.cpp" "5" -"mainwidget.h" "5" -"movableframe.cpp" "5" -"movableframe.h" "5" -"navigator.cpp" "5" -"navigator.h" "5" -"navigatorgraphicsview.cpp" "5" -"navigatorgraphicsview.h" "5" -"navigatorslider.cpp" "5" -"navigatorslider.h" "5" -"navigatorslider.ui" "5" -"search.cpp" "5" -"search.h" "5" -"search.ui" "5" -"searchmodel.cpp" "5" -"searchmodel.h" "5" -"shapegroupwidget.cpp" "5" -"shapegroupwidget.h" "5" -"shapestoolbox.cpp" "5" -"shapestoolbox.h" "5" -"shapestoolbox.ui" "5" -"sizegrip.cpp" "5" -"sizegrip.h" "5" -"stateproperties.cpp" "5" -"stateproperties.h" "5" -"stateview.cpp" "5" -"stateview.h" "5" -"stateview.ui" "5" -"statistics.cpp" "5" -"statistics.h" "5" -"statistics.ui" "5" -"statisticsdialog.cpp" "5" -"statisticsdialog.h" "5" -"statisticsdialog.ui" "5" -"structure.cpp" "5" -"structure.h" "5" -"structuremodel.cpp" "5" -"structuremodel.h" "5" -"treeview.cpp" "5" -"treeview.h" "5" +"colorpicker.cpp" "4" +"colorpicker.h" "4" +"colorpicker.ui" "4" +"colorsettings.cpp" "4" +"colorsettings.h" "4" +"colorsettings.ui" "4" +"colorthemedialog.cpp" "4" +"colorthemedialog.h" "4" +"colorthemedialog.ui" "4" +"colorthemes.cpp" "4" +"colorthemes.h" "4" +"colorthemeview.cpp" "4" +"colorthemeview.h" "4" +"colortoolbutton.cpp" "4" +"colortoolbutton.h" "4" +"common.qrc" "4" +"/scxmleditor" "5" +"images" "6" +"adjust_height.png" "7" +"adjust_height@2x.png" "7" +"adjust_size.png" "7" +"adjust_size@2x.png" "7" +"adjust_width.png" "7" +"adjust_width@2x.png" "7" +"align_bottom.png" "7" +"align_bottom@2x.png" "7" +"align_horizontal.png" "7" +"align_horizontal@2x.png" "7" +"align_left.png" "7" +"align_left@2x.png" "7" +"align_right.png" "7" +"align_right@2x.png" "7" +"align_top.png" "7" +"align_top@2x.png" "7" +"align_vertical.png" "7" +"align_vertical@2x.png" "7" +"colorthemes.png" "7" +"final.png" "7" +"font_color.png" "7" +"history.png" "7" +"icon-export-canvas.png" "7" +"icon-export-canvas@2x.png" "7" +"initial.png" "7" +"more_colors.png" "7" +"navigator.png" "7" +"parallel.png" "7" +"parallel_icon.png" "7" +"state.png" "7" +"state_color.png" "7" +"statistics.png" "7" +"dragshapebutton.cpp" "4" +"dragshapebutton.h" "4" +"graphicsview.cpp" "4" +"graphicsview.h" "4" +"magnifier.cpp" "4" +"magnifier.h" "4" +"magnifier.ui" "4" +"mainwidget.cpp" "4" +"mainwidget.h" "4" +"movableframe.cpp" "4" +"movableframe.h" "4" +"navigator.cpp" "4" +"navigator.h" "4" +"navigatorgraphicsview.cpp" "4" +"navigatorgraphicsview.h" "4" +"navigatorslider.cpp" "4" +"navigatorslider.h" "4" +"navigatorslider.ui" "4" +"search.cpp" "4" +"search.h" "4" +"search.ui" "4" +"searchmodel.cpp" "4" +"searchmodel.h" "4" +"shapegroupwidget.cpp" "4" +"shapegroupwidget.h" "4" +"shapestoolbox.cpp" "4" +"shapestoolbox.h" "4" +"shapestoolbox.ui" "4" +"sizegrip.cpp" "4" +"sizegrip.h" "4" +"stateproperties.cpp" "4" +"stateproperties.h" "4" +"stateview.cpp" "4" +"stateview.h" "4" +"stateview.ui" "4" +"statistics.cpp" "4" +"statistics.h" "4" +"statistics.ui" "4" +"statisticsdialog.cpp" "4" +"statisticsdialog.h" "4" +"statisticsdialog.ui" "4" +"structure.cpp" "4" +"structure.h" "4" +"structuremodel.cpp" "4" +"structuremodel.h" "4" +"treeview.cpp" "4" +"treeview.h" "4" "Output Pane" "3" "scxmleditor.qbs:82" "4" -"outputpane" "4" -"errorwidget.cpp" "5" -"errorwidget.h" "5" -"outputpane.h" "5" -"outputtabwidget.cpp" "5" -"outputtabwidget.h" "5" -"tableview.cpp" "5" -"tableview.h" "5" -"warning.cpp" "5" -"warning.h" "5" -"warningmodel.cpp" "5" -"warningmodel.h" "5" +"errorwidget.cpp" "4" +"errorwidget.h" "4" +"outputpane.h" "4" +"outputtabwidget.cpp" "4" +"outputtabwidget.h" "4" +"tableview.cpp" "4" +"tableview.h" "4" +"warning.cpp" "4" +"warning.h" "4" +"warningmodel.cpp" "4" +"warningmodel.h" "4" "Plugin Interface" "3" "scxmleditor.qbs:96" "4" -"plugin_interface" "4" -"actionhandler.cpp" "5" -"actionhandler.h" "5" -"actionprovider.h" "5" -"attributeitemdelegate.cpp" "5" -"attributeitemdelegate.h" "5" -"attributeitemmodel.cpp" "5" -"attributeitemmodel.h" "5" -"baseitem.cpp" "5" -"baseitem.h" "5" -"connectableitem.cpp" "5" -"connectableitem.h" "5" -"cornergrabberitem.cpp" "5" -"cornergrabberitem.h" "5" -"finalstateitem.cpp" "5" -"finalstateitem.h" "5" -"genericscxmlplugin.cpp" "5" -"genericscxmlplugin.h" "5" -"graphicsitemprovider.h" "5" -"graphicsscene.cpp" "5" -"graphicsscene.h" "5" -"highlightitem.cpp" "5" -"highlightitem.h" "5" -"historyitem.cpp" "5" -"historyitem.h" "5" -"idwarningitem.cpp" "5" -"idwarningitem.h" "5" -"imageprovider.cpp" "5" -"imageprovider.h" "5" -"initialstateitem.cpp" "5" -"initialstateitem.h" "5" -"initialwarningitem.cpp" "5" -"initialwarningitem.h" "5" -"isceditor.h" "5" -"layoutitem.cpp" "5" -"layoutitem.h" "5" -"mytypes.h" "5" -"parallelitem.cpp" "5" -"parallelitem.h" "5" -"quicktransitionitem.cpp" "5" -"quicktransitionitem.h" "5" -"scattributeitemdelegate.cpp" "5" -"scattributeitemdelegate.h" "5" -"scattributeitemmodel.cpp" "5" -"scattributeitemmodel.h" "5" -"sceneutils.cpp" "5" -"sceneutils.h" "5" -"scgraphicsitemprovider.cpp" "5" -"scgraphicsitemprovider.h" "5" -"scshapeprovider.cpp" "5" -"scshapeprovider.h" "5" -"scutilsprovider.cpp" "5" -"scutilsprovider.h" "5" -"scxmldocument.cpp" "5" -"scxmldocument.h" "5" -"scxmlnamespace.cpp" "5" -"scxmlnamespace.h" "5" -"scxmltag.cpp" "5" -"scxmltag.h" "5" -"scxmltagutils.cpp" "5" -"scxmltagutils.h" "5" -"scxmltypes.h" "5" -"scxmluifactory.cpp" "5" -"scxmluifactory.h" "5" -"serializer.cpp" "5" -"serializer.h" "5" -"shapeprovider.cpp" "5" -"shapeprovider.h" "5" -"snapline.cpp" "5" -"snapline.h" "5" -"stateitem.cpp" "5" -"stateitem.h" "5" -"statewarningitem.cpp" "5" -"statewarningitem.h" "5" -"tagtextitem.cpp" "5" -"tagtextitem.h" "5" -"textitem.cpp" "5" -"textitem.h" "5" -"transitionitem.cpp" "5" -"transitionitem.h" "5" -"transitionwarningitem.cpp" "5" -"transitionwarningitem.h" "5" -"undocommands.cpp" "5" -"undocommands.h" "5" -"utilsprovider.cpp" "5" -"utilsprovider.h" "5" -"warningitem.cpp" "5" -"warningitem.h" "5" -"warningprovider.h" "5" +"actionhandler.cpp" "4" +"actionhandler.h" "4" +"actionprovider.h" "4" +"attributeitemdelegate.cpp" "4" +"attributeitemdelegate.h" "4" +"attributeitemmodel.cpp" "4" +"attributeitemmodel.h" "4" +"baseitem.cpp" "4" +"baseitem.h" "4" +"connectableitem.cpp" "4" +"connectableitem.h" "4" +"cornergrabberitem.cpp" "4" +"cornergrabberitem.h" "4" +"finalstateitem.cpp" "4" +"finalstateitem.h" "4" +"genericscxmlplugin.cpp" "4" +"genericscxmlplugin.h" "4" +"graphicsitemprovider.h" "4" +"graphicsscene.cpp" "4" +"graphicsscene.h" "4" +"highlightitem.cpp" "4" +"highlightitem.h" "4" +"historyitem.cpp" "4" +"historyitem.h" "4" +"idwarningitem.cpp" "4" +"idwarningitem.h" "4" +"imageprovider.cpp" "4" +"imageprovider.h" "4" +"initialstateitem.cpp" "4" +"initialstateitem.h" "4" +"initialwarningitem.cpp" "4" +"initialwarningitem.h" "4" +"isceditor.h" "4" +"layoutitem.cpp" "4" +"layoutitem.h" "4" +"mytypes.h" "4" +"parallelitem.cpp" "4" +"parallelitem.h" "4" +"quicktransitionitem.cpp" "4" +"quicktransitionitem.h" "4" +"scattributeitemdelegate.cpp" "4" +"scattributeitemdelegate.h" "4" +"scattributeitemmodel.cpp" "4" +"scattributeitemmodel.h" "4" +"sceneutils.cpp" "4" +"sceneutils.h" "4" +"scgraphicsitemprovider.cpp" "4" +"scgraphicsitemprovider.h" "4" +"scshapeprovider.cpp" "4" +"scshapeprovider.h" "4" +"scutilsprovider.cpp" "4" +"scutilsprovider.h" "4" +"scxmldocument.cpp" "4" +"scxmldocument.h" "4" +"scxmlnamespace.cpp" "4" +"scxmlnamespace.h" "4" +"scxmltag.cpp" "4" +"scxmltag.h" "4" +"scxmltagutils.cpp" "4" +"scxmltagutils.h" "4" +"scxmltypes.h" "4" +"scxmluifactory.cpp" "4" +"scxmluifactory.h" "4" +"serializer.cpp" "4" +"serializer.h" "4" +"shapeprovider.cpp" "4" +"shapeprovider.h" "4" +"snapline.cpp" "4" +"snapline.h" "4" +"stateitem.cpp" "4" +"stateitem.h" "4" +"statewarningitem.cpp" "4" +"statewarningitem.h" "4" +"tagtextitem.cpp" "4" +"tagtextitem.h" "4" +"textitem.cpp" "4" +"textitem.h" "4" +"transitionitem.cpp" "4" +"transitionitem.h" "4" +"transitionwarningitem.cpp" "4" +"transitionwarningitem.h" "4" +"undocommands.cpp" "4" +"undocommands.h" "4" +"utilsprovider.cpp" "4" +"utilsprovider.h" "4" +"warningitem.cpp" "4" +"warningitem.h" "4" +"warningprovider.h" "4" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"ScxmlEditor.json.in" "5" +"ScxmlEditor.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -11673,7 +11676,7 @@ "serialterminal.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"SerialTerminal.json.in" "5" +"SerialTerminal.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -11697,7 +11700,7 @@ "silversearcher.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"SilverSearcher.json.in" "5" +"SilverSearcher.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -11718,7 +11721,7 @@ "subversion.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"Subversion.json.in" "5" +"Subversion.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -11747,7 +11750,7 @@ "tasklist.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"TaskList.json.in" "5" +"TaskList.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -11767,110 +11770,107 @@ "texteditor.qbs:8" "4" "CodeAssist" "4" "texteditor.qbs:149" "5" -"codeassist" "5" -"assistenums.h" "6" -"assistinterface.cpp" "6" -"assistinterface.h" "6" -"assistproposalitem.cpp" "6" -"assistproposalitem.h" "6" -"assistproposaliteminterface.h" "6" -"codeassistant.cpp" "6" -"codeassistant.h" "6" -"completionassistprovider.cpp" "6" -"completionassistprovider.h" "6" -"documentcontentcompletion.cpp" "6" -"documentcontentcompletion.h" "6" -"functionhintproposal.cpp" "6" -"functionhintproposal.h" "6" -"functionhintproposalwidget.cpp" "6" -"functionhintproposalwidget.h" "6" -"genericproposal.cpp" "6" -"genericproposal.h" "6" -"genericproposalmodel.cpp" "6" -"genericproposalmodel.h" "6" -"genericproposalwidget.cpp" "6" -"genericproposalwidget.h" "6" -"iassistprocessor.cpp" "6" -"iassistprocessor.h" "6" -"iassistproposal.cpp" "6" -"iassistproposal.h" "6" -"iassistproposalmodel.cpp" "6" -"iassistproposalmodel.h" "6" -"iassistproposalwidget.cpp" "6" -"iassistproposalwidget.h" "6" -"iassistprovider.cpp" "6" -"iassistprovider.h" "6" -"ifunctionhintproposalmodel.cpp" "6" -"ifunctionhintproposalmodel.h" "6" -"keywordscompletionassist.cpp" "6" -"keywordscompletionassist.h" "6" -"runner.cpp" "6" -"runner.h" "6" -"textdocumentmanipulator.cpp" "6" -"textdocumentmanipulator.h" "6" -"textdocumentmanipulatorinterface.h" "6" +"assistenums.h" "5" +"assistinterface.cpp" "5" +"assistinterface.h" "5" +"assistproposalitem.cpp" "5" +"assistproposalitem.h" "5" +"assistproposaliteminterface.h" "5" +"codeassistant.cpp" "5" +"codeassistant.h" "5" +"completionassistprovider.cpp" "5" +"completionassistprovider.h" "5" +"documentcontentcompletion.cpp" "5" +"documentcontentcompletion.h" "5" +"functionhintproposal.cpp" "5" +"functionhintproposal.h" "5" +"functionhintproposalwidget.cpp" "5" +"functionhintproposalwidget.h" "5" +"genericproposal.cpp" "5" +"genericproposal.h" "5" +"genericproposalmodel.cpp" "5" +"genericproposalmodel.h" "5" +"genericproposalwidget.cpp" "5" +"genericproposalwidget.h" "5" +"iassistprocessor.cpp" "5" +"iassistprocessor.h" "5" +"iassistproposal.cpp" "5" +"iassistproposal.h" "5" +"iassistproposalmodel.cpp" "5" +"iassistproposalmodel.h" "5" +"iassistproposalwidget.cpp" "5" +"iassistproposalwidget.h" "5" +"iassistprovider.cpp" "5" +"iassistprovider.h" "5" +"ifunctionhintproposalmodel.cpp" "5" +"ifunctionhintproposalmodel.h" "5" +"keywordscompletionassist.cpp" "5" +"keywordscompletionassist.h" "5" +"runner.cpp" "5" +"runner.h" "5" +"textdocumentmanipulator.cpp" "5" +"textdocumentmanipulator.h" "5" +"textdocumentmanipulatorinterface.h" "5" "GenericHighlighter" "4" "texteditor.qbs:197" "5" -"generichighlighter" "5" -"context.cpp" "6" -"context.h" "6" -"definitiondownloader.cpp" "6" -"definitiondownloader.h" "6" -"dynamicrule.cpp" "6" -"dynamicrule.h" "6" -"highlightdefinition.cpp" "6" -"highlightdefinition.h" "6" -"highlightdefinitionhandler.cpp" "6" -"highlightdefinitionhandler.h" "6" -"highlightdefinitionmetadata.h" "6" -"highlighter.cpp" "6" -"highlighter.h" "6" -"highlighterexception.h" "6" -"highlightersettings.cpp" "6" -"highlightersettings.h" "6" -"highlightersettingspage.cpp" "6" -"highlightersettingspage.h" "6" -"highlightersettingspage.ui" "6" -"includerulesinstruction.cpp" "6" -"includerulesinstruction.h" "6" -"itemdata.cpp" "6" -"itemdata.h" "6" -"keywordlist.cpp" "6" -"keywordlist.h" "6" -"managedefinitionsdialog.cpp" "6" -"managedefinitionsdialog.h" "6" -"managedefinitionsdialog.ui" "6" -"manager.cpp" "6" -"manager.h" "6" -"progressdata.cpp" "6" -"progressdata.h" "6" -"reuse.h" "6" -"rule.cpp" "6" -"rule.h" "6" -"specificrules.cpp" "6" -"specificrules.h" "6" +"context.cpp" "5" +"context.h" "5" +"definitiondownloader.cpp" "5" +"definitiondownloader.h" "5" +"dynamicrule.cpp" "5" +"dynamicrule.h" "5" +"highlightdefinition.cpp" "5" +"highlightdefinition.h" "5" +"highlightdefinitionhandler.cpp" "5" +"highlightdefinitionhandler.h" "5" +"highlightdefinitionmetadata.h" "5" +"highlighter.cpp" "5" +"highlighter.h" "5" +"highlighterexception.h" "5" +"highlightersettings.cpp" "5" +"highlightersettings.h" "5" +"highlightersettingspage.cpp" "5" +"highlightersettingspage.h" "5" +"highlightersettingspage.ui" "5" +"includerulesinstruction.cpp" "5" +"includerulesinstruction.h" "5" +"itemdata.cpp" "5" +"itemdata.h" "5" +"keywordlist.cpp" "5" +"keywordlist.h" "5" +"managedefinitionsdialog.cpp" "5" +"managedefinitionsdialog.h" "5" +"managedefinitionsdialog.ui" "5" +"manager.cpp" "5" +"manager.h" "5" +"progressdata.cpp" "5" +"progressdata.h" "5" +"reuse.h" "5" +"rule.cpp" "5" +"rule.h" "5" +"specificrules.cpp" "5" +"specificrules.h" "5" "PluginMetaData" "4" "QtcPlugin.qbs:49" "5" -"TextEditor.json.in" "6" +"TextEditor.json.in" "5" "Snippets" "4" "texteditor.qbs:241" "5" -"snippets" "5" -"reuse.h" "6" -"snippet.cpp" "6" -"snippet.h" "6" -"snippetassistcollector.cpp" "6" -"snippetassistcollector.h" "6" -"snippeteditor.cpp" "6" -"snippeteditor.h" "6" -"snippetprovider.cpp" "6" -"snippetprovider.h" "6" -"snippetscollection.cpp" "6" -"snippetscollection.h" "6" -"snippetssettings.cpp" "6" -"snippetssettings.h" "6" -"snippetssettingspage.cpp" "6" -"snippetssettingspage.h" "6" -"snippetssettingspage.ui" "6" +"reuse.h" "5" +"snippet.cpp" "5" +"snippet.h" "5" +"snippetassistcollector.cpp" "5" +"snippetassistcollector.h" "5" +"snippeteditor.cpp" "5" +"snippeteditor.h" "5" +"snippetprovider.cpp" "5" +"snippetprovider.h" "5" +"snippetscollection.cpp" "5" +"snippetscollection.h" "5" +"snippetssettings.cpp" "5" +"snippetssettings.h" "5" +"snippetssettingspage.cpp" "5" +"snippetssettingspage.h" "5" +"snippetssettingspage.ui" "5" "standard pch file (gui)" "4" "QtcProduct.qbs:65" "5" "qtcreator_gui_pch.h" "6" @@ -12018,125 +12018,125 @@ "texteditor.qbs:6" "4" "Group 1" "4" "QtcDevHeaders.qbs:10" "5" -"codeassist" "6" -"assistenums.h" "7" -"assistinterface.h" "7" -"assistproposalitem.h" "7" -"assistproposaliteminterface.h" "7" -"codeassistant.h" "7" -"completionassistprovider.h" "7" -"documentcontentcompletion.h" "7" -"functionhintproposal.h" "7" -"functionhintproposalwidget.h" "7" -"genericproposal.h" "7" -"genericproposalmodel.h" "7" -"genericproposalwidget.h" "7" -"iassistprocessor.h" "7" -"iassistproposal.h" "7" -"iassistproposalmodel.h" "7" -"iassistproposalwidget.h" "7" -"iassistprovider.h" "7" -"ifunctionhintproposalmodel.h" "7" -"keywordscompletionassist.h" "7" -"runner.h" "7" -"textdocumentmanipulator.h" "7" -"textdocumentmanipulatorinterface.h" "7" -"generichighlighter" "6" -"context.h" "7" -"definitiondownloader.h" "7" -"dynamicrule.h" "7" -"highlightdefinition.h" "7" -"highlightdefinitionhandler.h" "7" -"highlightdefinitionmetadata.h" "7" -"highlighter.h" "7" -"highlighterexception.h" "7" -"highlightersettings.h" "7" -"highlightersettingspage.h" "7" -"includerulesinstruction.h" "7" -"itemdata.h" "7" -"keywordlist.h" "7" -"managedefinitionsdialog.h" "7" -"manager.h" "7" -"progressdata.h" "7" -"reuse.h" "7" -"rule.h" "7" -"specificrules.h" "7" -"snippets" "6" -"reuse.h" "7" -"snippet.h" "7" -"snippetassistcollector.h" "7" -"snippeteditor.h" "7" -"snippetprovider.h" "7" -"snippetscollection.h" "7" -"snippetssettings.h" "7" -"snippetssettingspage.h" "7" -"autocompleter.h" "6" -"basefilefind.h" "6" -"basehoverhandler.h" "6" -"behaviorsettings.h" "6" -"behaviorsettingspage.h" "6" -"behaviorsettingswidget.h" "6" -"blockrange.h" "6" -"circularclipboard.h" "6" -"circularclipboardassist.h" "6" -"codecselector.h" "6" -"codestyleeditor.h" "6" -"codestylepool.h" "6" -"codestyleselectorwidget.h" "6" -"colorpreviewhoverhandler.h" "6" -"colorscheme.h" "6" -"colorschemeedit.h" "6" -"commentssettings.h" "6" -"completionsettings.h" "6" -"completionsettingspage.h" "6" -"displaysettings.h" "6" -"displaysettingspage.h" "6" -"extraencodingsettings.h" "6" -"findincurrentfile.h" "6" -"findinfiles.h" "6" -"findinopenfiles.h" "6" -"fontsettings.h" "6" -"fontsettingspage.h" "6" -"helpitem.h" "6" -"highlighterutils.h" "6" -"icodestylepreferences.h" "6" -"icodestylepreferencesfactory.h" "6" -"indenter.h" "6" -"ioutlinewidget.h" "6" -"linenumberfilter.h" "6" -"marginsettings.h" "6" -"normalindenter.h" "6" -"outlinefactory.h" "6" -"plaintexteditorfactory.h" "6" -"quickfix.h" "6" -"refactoringchanges.h" "6" -"refactoroverlay.h" "6" -"semantichighlighter.h" "6" -"simplecodestylepreferences.h" "6" -"simplecodestylepreferenceswidget.h" "6" -"storagesettings.h" "6" -"syntaxhighlighter.h" "6" -"tabsettings.h" "6" -"tabsettingswidget.h" "6" -"textdocument.h" "6" -"textdocumentlayout.h" "6" -"texteditor.h" "6" -"texteditor_global.h" "6" -"texteditor_p.h" "6" -"texteditoractionhandler.h" "6" -"texteditorconstants.h" "6" -"texteditoroptionspage.h" "6" -"texteditoroverlay.h" "6" -"texteditorplugin.h" "6" -"texteditorsettings.h" "6" -"textmark.h" "6" -"textstyles.h" "6" -"typingsettings.h" "6" +"codeassist" "5" +"assistenums.h" "6" +"assistinterface.h" "6" +"assistproposalitem.h" "6" +"assistproposaliteminterface.h" "6" +"codeassistant.h" "6" +"completionassistprovider.h" "6" +"documentcontentcompletion.h" "6" +"functionhintproposal.h" "6" +"functionhintproposalwidget.h" "6" +"genericproposal.h" "6" +"genericproposalmodel.h" "6" +"genericproposalwidget.h" "6" +"iassistprocessor.h" "6" +"iassistproposal.h" "6" +"iassistproposalmodel.h" "6" +"iassistproposalwidget.h" "6" +"iassistprovider.h" "6" +"ifunctionhintproposalmodel.h" "6" +"keywordscompletionassist.h" "6" +"runner.h" "6" +"textdocumentmanipulator.h" "6" +"textdocumentmanipulatorinterface.h" "6" +"generichighlighter" "5" +"context.h" "6" +"definitiondownloader.h" "6" +"dynamicrule.h" "6" +"highlightdefinition.h" "6" +"highlightdefinitionhandler.h" "6" +"highlightdefinitionmetadata.h" "6" +"highlighter.h" "6" +"highlighterexception.h" "6" +"highlightersettings.h" "6" +"highlightersettingspage.h" "6" +"includerulesinstruction.h" "6" +"itemdata.h" "6" +"keywordlist.h" "6" +"managedefinitionsdialog.h" "6" +"manager.h" "6" +"progressdata.h" "6" +"reuse.h" "6" +"rule.h" "6" +"specificrules.h" "6" +"snippets" "5" +"reuse.h" "6" +"snippet.h" "6" +"snippetassistcollector.h" "6" +"snippeteditor.h" "6" +"snippetprovider.h" "6" +"snippetscollection.h" "6" +"snippetssettings.h" "6" +"snippetssettingspage.h" "6" +"autocompleter.h" "5" +"basefilefind.h" "5" +"basehoverhandler.h" "5" +"behaviorsettings.h" "5" +"behaviorsettingspage.h" "5" +"behaviorsettingswidget.h" "5" +"blockrange.h" "5" +"circularclipboard.h" "5" +"circularclipboardassist.h" "5" +"codecselector.h" "5" +"codestyleeditor.h" "5" +"codestylepool.h" "5" +"codestyleselectorwidget.h" "5" +"colorpreviewhoverhandler.h" "5" +"colorscheme.h" "5" +"colorschemeedit.h" "5" +"commentssettings.h" "5" +"completionsettings.h" "5" +"completionsettingspage.h" "5" +"displaysettings.h" "5" +"displaysettingspage.h" "5" +"extraencodingsettings.h" "5" +"findincurrentfile.h" "5" +"findinfiles.h" "5" +"findinopenfiles.h" "5" +"fontsettings.h" "5" +"fontsettingspage.h" "5" +"helpitem.h" "5" +"highlighterutils.h" "5" +"icodestylepreferences.h" "5" +"icodestylepreferencesfactory.h" "5" +"indenter.h" "5" +"ioutlinewidget.h" "5" +"linenumberfilter.h" "5" +"marginsettings.h" "5" +"normalindenter.h" "5" +"outlinefactory.h" "5" +"plaintexteditorfactory.h" "5" +"quickfix.h" "5" +"refactoringchanges.h" "5" +"refactoroverlay.h" "5" +"semantichighlighter.h" "5" +"simplecodestylepreferences.h" "5" +"simplecodestylepreferenceswidget.h" "5" +"storagesettings.h" "5" +"syntaxhighlighter.h" "5" +"tabsettings.h" "5" +"tabsettingswidget.h" "5" +"textdocument.h" "5" +"textdocumentlayout.h" "5" +"texteditor.h" "5" +"texteditor_global.h" "5" +"texteditor_p.h" "5" +"texteditoractionhandler.h" "5" +"texteditorconstants.h" "5" +"texteditoroptionspage.h" "5" +"texteditoroverlay.h" "5" +"texteditorplugin.h" "5" +"texteditorsettings.h" "5" +"textmark.h" "5" +"textstyles.h" "5" +"typingsettings.h" "5" "Todo" "2" "todo.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"Todo.json.in" "5" +"Todo.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -12197,7 +12197,7 @@ "updateinfo.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"UpdateInfo.json.in" "5" +"UpdateInfo.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -12213,33 +12213,32 @@ "valgrind.qbs:4" "3" "Callgrind" "3" "valgrind.qbs:42" "4" -"callgrind" "4" -"callgrindabstractmodel.h" "5" -"callgrindcallmodel.cpp" "5" -"callgrindcallmodel.h" "5" -"callgrindcontroller.cpp" "5" -"callgrindcontroller.h" "5" -"callgrindcostitem.cpp" "5" -"callgrindcostitem.h" "5" -"callgrindcycledetection.cpp" "5" -"callgrindcycledetection.h" "5" -"callgrinddatamodel.cpp" "5" -"callgrinddatamodel.h" "5" -"callgrindfunction.cpp" "5" -"callgrindfunction.h" "5" -"callgrindfunction_p.h" "5" -"callgrindfunctioncall.cpp" "5" -"callgrindfunctioncall.h" "5" -"callgrindfunctioncycle.cpp" "5" -"callgrindfunctioncycle.h" "5" -"callgrindparsedata.cpp" "5" -"callgrindparsedata.h" "5" -"callgrindparser.cpp" "5" -"callgrindparser.h" "5" -"callgrindproxymodel.cpp" "5" -"callgrindproxymodel.h" "5" -"callgrindstackbrowser.cpp" "5" -"callgrindstackbrowser.h" "5" +"callgrindabstractmodel.h" "4" +"callgrindcallmodel.cpp" "4" +"callgrindcallmodel.h" "4" +"callgrindcontroller.cpp" "4" +"callgrindcontroller.h" "4" +"callgrindcostitem.cpp" "4" +"callgrindcostitem.h" "4" +"callgrindcycledetection.cpp" "4" +"callgrindcycledetection.h" "4" +"callgrinddatamodel.cpp" "4" +"callgrinddatamodel.h" "4" +"callgrindfunction.cpp" "4" +"callgrindfunction.h" "4" +"callgrindfunction_p.h" "4" +"callgrindfunctioncall.cpp" "4" +"callgrindfunctioncall.h" "4" +"callgrindfunctioncycle.cpp" "4" +"callgrindfunctioncycle.h" "4" +"callgrindparsedata.cpp" "4" +"callgrindparsedata.h" "4" +"callgrindparser.cpp" "4" +"callgrindparser.h" "4" +"callgrindproxymodel.cpp" "4" +"callgrindproxymodel.h" "4" +"callgrindstackbrowser.cpp" "4" +"callgrindstackbrowser.h" "4" "General" "3" "valgrind.qbs:19" "4" "callgrindcostdelegate.cpp" "4" @@ -12282,7 +12281,7 @@ "valgrindsettings.h" "4" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"Valgrind.json.in" "5" +"Valgrind.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -12297,34 +12296,33 @@ "valgrindtestrunnertest.h" "4" "XML Protocol" "3" "valgrind.qbs:62" "4" -"xmlprotocol" "4" -"announcethread.cpp" "5" -"announcethread.h" "5" -"error.cpp" "5" -"error.h" "5" -"errorlistmodel.cpp" "5" -"errorlistmodel.h" "5" -"frame.cpp" "5" -"frame.h" "5" -"modelhelpers.cpp" "5" -"modelhelpers.h" "5" -"parser.cpp" "5" -"parser.h" "5" -"stack.cpp" "5" -"stack.h" "5" -"stackmodel.cpp" "5" -"stackmodel.h" "5" -"status.cpp" "5" -"status.h" "5" -"suppression.cpp" "5" -"suppression.h" "5" -"threadedparser.cpp" "5" -"threadedparser.h" "5" +"announcethread.cpp" "4" +"announcethread.h" "4" +"error.cpp" "4" +"error.h" "4" +"errorlistmodel.cpp" "4" +"errorlistmodel.h" "4" +"frame.cpp" "4" +"frame.h" "4" +"modelhelpers.cpp" "4" +"modelhelpers.h" "4" +"parser.cpp" "4" +"parser.h" "4" +"stack.cpp" "4" +"stack.h" "4" +"stackmodel.cpp" "4" +"stackmodel.h" "4" +"status.cpp" "4" +"status.h" "4" +"suppression.cpp" "4" +"suppression.h" "4" +"threadedparser.cpp" "4" +"threadedparser.h" "4" "VcsBase" "2" "vcsbase.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"VcsBase.json.in" "5" +"VcsBase.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -12409,7 +12407,7 @@ "welcome.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"Welcome.json.in" "5" +"Welcome.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -12446,7 +12444,7 @@ "winrt.qbs:3" "3" "PluginMetaData" "3" "QtcPlugin.qbs:49" "4" -"WinRt.json.in" "5" +"WinRt.json.in" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -12491,16 +12489,16 @@ "proparser.qbs:3" "2" "Group 1" "2" "QtcDevHeaders.qbs:10" "3" -"ioutils.h" "4" -"profileevaluator.h" "4" -"proitems.h" "4" -"prowriter.h" "4" -"qmake_global.h" "4" -"qmakeevaluator.h" "4" -"qmakeevaluator_p.h" "4" -"qmakeglobals.h" "4" -"qmakeparser.h" "4" -"qmakevfs.h" "4" +"ioutils.h" "3" +"profileevaluator.h" "3" +"proitems.h" "3" +"prowriter.h" "3" +"qmake_global.h" "3" +"qmakeevaluator.h" "3" +"qmakeevaluator_p.h" "3" +"qmakeglobals.h" "3" +"qmakeparser.h" "3" +"qmakevfs.h" "3" "qbs project" "1" "src.qbs:23" "2" "apps" "2" @@ -12613,18 +12611,17 @@ "consolelogger.h" "6" "parser" "4" "qbs.qbs:29" "5" -"parser" "5" -"commandlineoption.cpp" "6" -"commandlineoption.h" "6" -"commandlineoptionpool.cpp" "6" -"commandlineoptionpool.h" "6" -"commandlineparser.cpp" "6" -"commandlineparser.h" "6" -"commandpool.cpp" "6" -"commandpool.h" "6" -"commandtype.h" "6" -"parsercommand.cpp" "6" -"parsercommand.h" "6" +"commandlineoption.cpp" "5" +"commandlineoption.h" "5" +"commandlineoptionpool.cpp" "5" +"commandlineoptionpool.h" "5" +"commandlineparser.cpp" "5" +"commandlineparser.h" "5" +"commandpool.cpp" "5" +"commandpool.h" "5" +"commandtype.h" "5" +"parsercommand.cpp" "5" +"parsercommand.h" "5" "application.cpp" "4" "application.h" "4" "commandlinefrontend.cpp" "4" @@ -12664,265 +12661,253 @@ "corelib.qbs:4" "4" "api" "4" "corelib.qbs:69" "5" -"api" "5" -"internaljobs.cpp" "6" -"internaljobs.h" "6" -"jobs.cpp" "6" -"languageinfo.cpp" "6" -"project.cpp" "6" -"project_p.h" "6" -"projectdata.cpp" "6" -"projectdata_p.h" "6" -"propertymap_p.h" "6" -"rulecommand.cpp" "6" -"rulecommand_p.h" "6" -"runenvironment.cpp" "6" -"transformerdata.cpp" "6" -"transformerdata_p.h" "6" +"internaljobs.cpp" "5" +"internaljobs.h" "5" +"jobs.cpp" "5" +"languageinfo.cpp" "5" +"project.cpp" "5" +"project_p.h" "5" +"projectdata.cpp" "5" +"projectdata_p.h" "5" +"propertymap_p.h" "5" +"rulecommand.cpp" "5" +"rulecommand_p.h" "5" +"runenvironment.cpp" "5" +"transformerdata.cpp" "5" +"transformerdata_p.h" "5" "buildgraph" "4" "corelib.qbs:104" "5" -"buildgraph" "5" -"abstractcommandexecutor.cpp" "6" -"abstractcommandexecutor.h" "6" -"artifact.cpp" "6" -"artifact.h" "6" -"artifactcleaner.cpp" "6" -"artifactcleaner.h" "6" -"artifactsscriptvalue.cpp" "6" -"artifactsscriptvalue.h" "6" -"artifactvisitor.cpp" "6" -"artifactvisitor.h" "6" -"buildgraph.cpp" "6" -"buildgraph.h" "6" -"buildgraphloader.cpp" "6" -"buildgraphloader.h" "6" -"buildgraphnode.cpp" "6" -"buildgraphnode.h" "6" -"buildgraphvisitor.h" "6" -"cycledetector.cpp" "6" -"cycledetector.h" "6" -"dependencyparametersscriptvalue.cpp" "6" -"dependencyparametersscriptvalue.h" "6" -"depscanner.cpp" "6" -"depscanner.h" "6" -"emptydirectoriesremover.cpp" "6" -"emptydirectoriesremover.h" "6" -"environmentscriptrunner.cpp" "6" -"environmentscriptrunner.h" "6" -"executor.cpp" "6" -"executor.h" "6" -"executorjob.cpp" "6" -"executorjob.h" "6" -"filedependency.cpp" "6" -"filedependency.h" "6" -"inputartifactscanner.cpp" "6" -"inputartifactscanner.h" "6" -"jscommandexecutor.cpp" "6" -"jscommandexecutor.h" "6" -"nodeset.cpp" "6" -"nodeset.h" "6" -"nodetreedumper.cpp" "6" -"nodetreedumper.h" "6" -"processcommandexecutor.cpp" "6" -"processcommandexecutor.h" "6" -"productbuilddata.cpp" "6" -"productbuilddata.h" "6" -"productinstaller.cpp" "6" -"productinstaller.h" "6" -"projectbuilddata.cpp" "6" -"projectbuilddata.h" "6" -"qtmocscanner.cpp" "6" -"qtmocscanner.h" "6" -"rawscanneddependency.cpp" "6" -"rawscanneddependency.h" "6" -"rawscanresults.cpp" "6" -"rawscanresults.h" "6" -"requestedartifacts.cpp" "6" -"requestedartifacts.h" "6" -"requesteddependencies.cpp" "6" -"requesteddependencies.h" "6" -"rescuableartifactdata.h" "6" -"rulecommands.cpp" "6" -"rulecommands.h" "6" -"rulegraph.cpp" "6" -"rulegraph.h" "6" -"rulenode.cpp" "6" -"rulenode.h" "6" -"rulesapplicator.cpp" "6" -"rulesapplicator.h" "6" -"rulesevaluationcontext.cpp" "6" -"rulesevaluationcontext.h" "6" -"scriptclasspropertyiterator.h" "6" -"timestampsupdater.cpp" "6" -"timestampsupdater.h" "6" -"transformer.cpp" "6" -"transformer.h" "6" -"transformerchangetracking.cpp" "6" -"transformerchangetracking.h" "6" +"abstractcommandexecutor.cpp" "5" +"abstractcommandexecutor.h" "5" +"artifact.cpp" "5" +"artifact.h" "5" +"artifactcleaner.cpp" "5" +"artifactcleaner.h" "5" +"artifactsscriptvalue.cpp" "5" +"artifactsscriptvalue.h" "5" +"artifactvisitor.cpp" "5" +"artifactvisitor.h" "5" +"buildgraph.cpp" "5" +"buildgraph.h" "5" +"buildgraphloader.cpp" "5" +"buildgraphloader.h" "5" +"buildgraphnode.cpp" "5" +"buildgraphnode.h" "5" +"buildgraphvisitor.h" "5" +"cycledetector.cpp" "5" +"cycledetector.h" "5" +"dependencyparametersscriptvalue.cpp" "5" +"dependencyparametersscriptvalue.h" "5" +"depscanner.cpp" "5" +"depscanner.h" "5" +"emptydirectoriesremover.cpp" "5" +"emptydirectoriesremover.h" "5" +"environmentscriptrunner.cpp" "5" +"environmentscriptrunner.h" "5" +"executor.cpp" "5" +"executor.h" "5" +"executorjob.cpp" "5" +"executorjob.h" "5" +"filedependency.cpp" "5" +"filedependency.h" "5" +"inputartifactscanner.cpp" "5" +"inputartifactscanner.h" "5" +"jscommandexecutor.cpp" "5" +"jscommandexecutor.h" "5" +"nodeset.cpp" "5" +"nodeset.h" "5" +"nodetreedumper.cpp" "5" +"nodetreedumper.h" "5" +"processcommandexecutor.cpp" "5" +"processcommandexecutor.h" "5" +"productbuilddata.cpp" "5" +"productbuilddata.h" "5" +"productinstaller.cpp" "5" +"productinstaller.h" "5" +"projectbuilddata.cpp" "5" +"projectbuilddata.h" "5" +"qtmocscanner.cpp" "5" +"qtmocscanner.h" "5" +"rawscanneddependency.cpp" "5" +"rawscanneddependency.h" "5" +"rawscanresults.cpp" "5" +"rawscanresults.h" "5" +"requestedartifacts.cpp" "5" +"requestedartifacts.h" "5" +"requesteddependencies.cpp" "5" +"requesteddependencies.h" "5" +"rescuableartifactdata.h" "5" +"rulecommands.cpp" "5" +"rulecommands.h" "5" +"rulegraph.cpp" "5" +"rulegraph.h" "5" +"rulenode.cpp" "5" +"rulenode.h" "5" +"rulesapplicator.cpp" "5" +"rulesapplicator.h" "5" +"rulesevaluationcontext.cpp" "5" +"rulesevaluationcontext.h" "5" +"scriptclasspropertyiterator.h" "5" +"timestampsupdater.cpp" "5" +"timestampsupdater.h" "5" +"transformer.cpp" "5" +"transformer.h" "5" +"transformerchangetracking.cpp" "5" +"transformerchangetracking.h" "5" "generators" "4" "corelib.qbs:193" "5" -"generators" "5" -"generatableprojectiterator.cpp" "6" -"generatableprojectiterator.h" "6" -"generator.cpp" "6" -"generatordata.cpp" "6" -"igeneratableprojectvisitor.h" "6" +"generatableprojectiterator.cpp" "5" +"generatableprojectiterator.h" "5" +"generator.cpp" "5" +"generatordata.cpp" "5" +"igeneratableprojectvisitor.h" "5" "jsextensions" "4" "corelib.qbs:214" "5" -"jsextensions" "5" -"binaryfile.cpp" "6" -"domxml.cpp" "6" -"environmentextension.cpp" "6" -"file.cpp" "6" -"fileinfoextension.cpp" "6" -"jsextensions.cpp" "6" -"jsextensions.h" "6" -"moduleproperties.cpp" "6" -"moduleproperties.h" "6" -"process.cpp" "6" -"temporarydir.cpp" "6" -"textfile.cpp" "6" -"utilitiesextension.cpp" "6" +"binaryfile.cpp" "5" +"domxml.cpp" "5" +"environmentextension.cpp" "5" +"file.cpp" "5" +"fileinfoextension.cpp" "5" +"jsextensions.cpp" "5" +"jsextensions.h" "5" +"moduleproperties.cpp" "5" +"moduleproperties.h" "5" +"process.cpp" "5" +"temporarydir.cpp" "5" +"textfile.cpp" "5" +"utilitiesextension.cpp" "5" "jsextensions (Darwin-specific)" "4" "corelib.qbs:241" "5" -"jsextensions" "5" -"propertylist.mm" "6" -"propertylistutils.h" "6" -"propertylistutils.mm" "6" +"propertylist.mm" "5" +"propertylistutils.h" "5" +"propertylistutils.mm" "5" "jsextensions (Non-Darwin-specific)" "4" "corelib.qbs:233" "5" -"jsextensions" "5" -"propertylist.cpp" "6" +"propertylist.cpp" "5" "language" "4" "corelib.qbs:251" "5" -"language" "5" -"artifactproperties.cpp" "6" -"artifactproperties.h" "6" -"astimportshandler.cpp" "6" -"astimportshandler.h" "6" -"astpropertiesitemhandler.cpp" "6" -"astpropertiesitemhandler.h" "6" -"asttools.cpp" "6" -"asttools.h" "6" -"builtindeclarations.cpp" "6" -"builtindeclarations.h" "6" -"deprecationinfo.h" "6" -"evaluationdata.h" "6" -"evaluator.cpp" "6" -"evaluator.h" "6" -"evaluatorscriptclass.cpp" "6" -"evaluatorscriptclass.h" "6" -"filecontext.cpp" "6" -"filecontext.h" "6" -"filecontextbase.cpp" "6" -"filecontextbase.h" "6" -"filetags.cpp" "6" -"filetags.h" "6" -"identifiersearch.cpp" "6" -"identifiersearch.h" "6" -"item.cpp" "6" -"item.h" "6" -"itemdeclaration.cpp" "6" -"itemdeclaration.h" "6" -"itemobserver.h" "6" -"itempool.cpp" "6" -"itempool.h" "6" -"itemreader.cpp" "6" -"itemreader.h" "6" -"itemreaderastvisitor.cpp" "6" -"itemreaderastvisitor.h" "6" -"itemreadervisitorstate.cpp" "6" -"itemreadervisitorstate.h" "6" -"itemtype.h" "6" -"jsimports.h" "6" -"language.cpp" "6" -"language.h" "6" -"loader.cpp" "6" -"loader.h" "6" -"moduleloader.cpp" "6" -"moduleloader.h" "6" -"modulemerger.cpp" "6" -"modulemerger.h" "6" -"preparescriptobserver.cpp" "6" -"preparescriptobserver.h" "6" -"projectresolver.cpp" "6" -"projectresolver.h" "6" -"property.cpp" "6" -"property.h" "6" -"propertydeclaration.cpp" "6" -"propertydeclaration.h" "6" -"propertymapinternal.cpp" "6" -"propertymapinternal.h" "6" -"qualifiedid.cpp" "6" -"qualifiedid.h" "6" -"resolvedfilecontext.cpp" "6" -"resolvedfilecontext.h" "6" -"scriptengine.cpp" "6" -"scriptengine.h" "6" -"scriptimporter.cpp" "6" -"scriptimporter.h" "6" -"scriptpropertyobserver.cpp" "6" -"scriptpropertyobserver.h" "6" -"value.cpp" "6" -"value.h" "6" +"artifactproperties.cpp" "5" +"artifactproperties.h" "5" +"astimportshandler.cpp" "5" +"astimportshandler.h" "5" +"astpropertiesitemhandler.cpp" "5" +"astpropertiesitemhandler.h" "5" +"asttools.cpp" "5" +"asttools.h" "5" +"builtindeclarations.cpp" "5" +"builtindeclarations.h" "5" +"deprecationinfo.h" "5" +"evaluationdata.h" "5" +"evaluator.cpp" "5" +"evaluator.h" "5" +"evaluatorscriptclass.cpp" "5" +"evaluatorscriptclass.h" "5" +"filecontext.cpp" "5" +"filecontext.h" "5" +"filecontextbase.cpp" "5" +"filecontextbase.h" "5" +"filetags.cpp" "5" +"filetags.h" "5" +"identifiersearch.cpp" "5" +"identifiersearch.h" "5" +"item.cpp" "5" +"item.h" "5" +"itemdeclaration.cpp" "5" +"itemdeclaration.h" "5" +"itemobserver.h" "5" +"itempool.cpp" "5" +"itempool.h" "5" +"itemreader.cpp" "5" +"itemreader.h" "5" +"itemreaderastvisitor.cpp" "5" +"itemreaderastvisitor.h" "5" +"itemreadervisitorstate.cpp" "5" +"itemreadervisitorstate.h" "5" +"itemtype.h" "5" +"jsimports.h" "5" +"language.cpp" "5" +"language.h" "5" +"loader.cpp" "5" +"loader.h" "5" +"moduleloader.cpp" "5" +"moduleloader.h" "5" +"modulemerger.cpp" "5" +"modulemerger.h" "5" +"preparescriptobserver.cpp" "5" +"preparescriptobserver.h" "5" +"projectresolver.cpp" "5" +"projectresolver.h" "5" +"property.cpp" "5" +"property.h" "5" +"propertydeclaration.cpp" "5" +"propertydeclaration.h" "5" +"propertymapinternal.cpp" "5" +"propertymapinternal.h" "5" +"qualifiedid.cpp" "5" +"qualifiedid.h" "5" +"resolvedfilecontext.cpp" "5" +"resolvedfilecontext.h" "5" +"scriptengine.cpp" "5" +"scriptengine.h" "5" +"scriptimporter.cpp" "5" +"scriptimporter.h" "5" +"scriptpropertyobserver.cpp" "5" +"scriptpropertyobserver.h" "5" +"value.cpp" "5" +"value.h" "5" "logging" "4" "corelib.qbs:332" "5" -"logging" "5" -"categories.cpp" "6" -"categories.h" "6" -"ilogsink.cpp" "6" -"logger.cpp" "6" -"logger.h" "6" -"translator.h" "6" +"categories.cpp" "5" +"categories.h" "5" +"ilogsink.cpp" "5" +"logger.cpp" "5" +"logger.h" "5" +"translator.h" "5" "parser" "4" "corelib.qbs:350" "5" -"parser" "5" -"qmlerror.cpp" "6" -"qmlerror.h" "6" -"qmljsast.cpp" "6" -"qmljsast_p.h" "6" -"qmljsastfwd_p.h" "6" -"qmljsastvisitor.cpp" "6" -"qmljsastvisitor_p.h" "6" -"qmljsengine_p.cpp" "6" -"qmljsengine_p.h" "6" -"qmljsglobal_p.h" "6" -"qmljsgrammar.cpp" "6" -"qmljsgrammar_p.h" "6" -"qmljskeywords_p.h" "6" -"qmljslexer.cpp" "6" -"qmljslexer_p.h" "6" -"qmljsmemorypool_p.h" "6" -"qmljsparser.cpp" "6" -"qmljsparser_p.h" "6" +"qmlerror.cpp" "5" +"qmlerror.h" "5" +"qmljsast.cpp" "5" +"qmljsast_p.h" "5" +"qmljsastfwd_p.h" "5" +"qmljsastvisitor.cpp" "5" +"qmljsastvisitor_p.h" "5" +"qmljsengine_p.cpp" "5" +"qmljsengine_p.h" "5" +"qmljsglobal_p.h" "5" +"qmljsgrammar.cpp" "5" +"qmljsgrammar_p.h" "5" +"qmljskeywords_p.h" "5" +"qmljslexer.cpp" "5" +"qmljslexer_p.h" "5" +"qmljsmemorypool_p.h" "5" +"qmljsparser.cpp" "5" +"qmljsparser_p.h" "5" "project file updating" "4" "corelib.qbs:55" "5" -"api" "5" -"changeset.cpp" "6" -"changeset.h" "6" -"projectfileupdater.cpp" "6" -"projectfileupdater.h" "6" -"qmljsrewriter.cpp" "6" -"qmljsrewriter.h" "6" +"changeset.cpp" "5" +"changeset.h" "5" +"projectfileupdater.cpp" "5" +"projectfileupdater.h" "5" +"qmljsrewriter.cpp" "5" +"qmljsrewriter.h" "5" "public api headers" "4" "corelib.qbs:89" "5" -"api" "5" -"jobs.h" "6" -"languageinfo.h" "6" -"project.h" "6" -"projectdata.h" "6" -"rulecommand.h" "6" -"runenvironment.h" "6" -"transformerdata.h" "6" +"jobs.h" "5" +"languageinfo.h" "5" +"project.h" "5" +"projectdata.h" "5" +"rulecommand.h" "5" +"runenvironment.h" "5" +"transformerdata.h" "5" "public buildgraph headers" "4" "corelib.qbs:187" "5" "buildgraph" "5" "forward_decls.h" "6" "public generator headers" "4" "corelib.qbs:204" "5" -"generators" "5" -"generator.h" "6" -"generatordata.h" "6" +"generator.h" "5" +"generatordata.h" "5" "public language headers" "4" "corelib.qbs:326" "5" "language" "5" @@ -12933,115 +12918,112 @@ "ilogsink.h" "6" "public tools headers" "4" "corelib.qbs:459" "5" -"tools" "5" -"architectures.h" "6" -"buildoptions.h" "6" -"cleanoptions.h" "6" -"codelocation.h" "6" -"commandechomode.h" "6" -"error.h" "6" -"generateoptions.h" "6" -"installoptions.h" "6" -"preferences.h" "6" -"processresult.h" "6" -"profile.h" "6" -"projectgeneratormanager.h" "6" -"qbs_export.h" "6" -"settings.h" "6" -"settingsmodel.h" "6" -"setupprojectparameters.h" "6" -"toolchains.h" "6" -"version.h" "6" +"architectures.h" "5" +"buildoptions.h" "5" +"cleanoptions.h" "5" +"codelocation.h" "5" +"commandechomode.h" "5" +"error.h" "5" +"generateoptions.h" "5" +"installoptions.h" "5" +"preferences.h" "5" +"processresult.h" "5" +"profile.h" "5" +"projectgeneratormanager.h" "5" +"qbs_export.h" "5" +"settings.h" "5" +"settingsmodel.h" "5" +"setupprojectparameters.h" "5" +"toolchains.h" "5" +"version.h" "5" "qbscore" "4" "corelib.qbs:49" "5" "qbs.h" "5" "tools" "4" "corelib.qbs:374" "5" -"tools" "5" -"architectures.cpp" "6" -"buildgraphlocker.cpp" "6" -"buildgraphlocker.h" "6" -"buildoptions.cpp" "6" -"cleanoptions.cpp" "6" -"codelocation.cpp" "6" -"commandechomode.cpp" "6" -"dynamictypecheck.h" "6" -"error.cpp" "6" -"executablefinder.cpp" "6" -"executablefinder.h" "6" -"fileinfo.cpp" "6" -"fileinfo.h" "6" -"filesaver.cpp" "6" -"filesaver.h" "6" -"filetime.cpp" "6" -"filetime.h" "6" -"generateoptions.cpp" "6" -"hostosinfo.h" "6" -"id.cpp" "6" -"id.h" "6" -"installoptions.cpp" "6" -"iosutils.h" "6" -"jsliterals.cpp" "6" -"jsliterals.h" "6" -"launcherinterface.cpp" "6" -"launcherinterface.h" "6" -"launcherpackets.cpp" "6" -"launcherpackets.h" "6" -"launchersocket.cpp" "6" -"launchersocket.h" "6" -"msvcinfo.cpp" "6" -"msvcinfo.h" "6" -"pathutils.h" "6" -"persistence.cpp" "6" -"persistence.h" "6" -"preferences.cpp" "6" -"processresult.cpp" "6" -"processresult_p.h" "6" -"processutils.cpp" "6" -"processutils.h" "6" -"profile.cpp" "6" -"profiling.cpp" "6" -"profiling.h" "6" -"progressobserver.cpp" "6" -"progressobserver.h" "6" -"projectgeneratormanager.cpp" "6" -"qbsassert.cpp" "6" -"qbsassert.h" "6" -"qbspluginmanager.cpp" "6" -"qbspluginmanager.h" "6" -"qbsprocess.cpp" "6" -"qbsprocess.h" "6" -"qttools.cpp" "6" -"qttools.h" "6" -"scannerpluginmanager.cpp" "6" -"scannerpluginmanager.h" "6" -"scripttools.cpp" "6" -"scripttools.h" "6" -"set.h" "6" -"settings.cpp" "6" -"settingscreator.cpp" "6" -"settingscreator.h" "6" -"settingsmodel.cpp" "6" -"settingsrepresentation.cpp" "6" -"settingsrepresentation.h" "6" -"setupprojectparameters.cpp" "6" -"shellutils.cpp" "6" -"shellutils.h" "6" -"stlutils.h" "6" -"stringconstants.h" "6" -"stringutils.h" "6" -"toolchains.cpp" "6" -"version.cpp" "6" -"visualstudioversioninfo.cpp" "6" -"visualstudioversioninfo.h" "6" -"vsenvironmentdetector.cpp" "6" -"vsenvironmentdetector.h" "6" -"weakpointer.h" "6" +"architectures.cpp" "5" +"buildgraphlocker.cpp" "5" +"buildgraphlocker.h" "5" +"buildoptions.cpp" "5" +"cleanoptions.cpp" "5" +"codelocation.cpp" "5" +"commandechomode.cpp" "5" +"dynamictypecheck.h" "5" +"error.cpp" "5" +"executablefinder.cpp" "5" +"executablefinder.h" "5" +"fileinfo.cpp" "5" +"fileinfo.h" "5" +"filesaver.cpp" "5" +"filesaver.h" "5" +"filetime.cpp" "5" +"filetime.h" "5" +"generateoptions.cpp" "5" +"hostosinfo.h" "5" +"id.cpp" "5" +"id.h" "5" +"installoptions.cpp" "5" +"iosutils.h" "5" +"jsliterals.cpp" "5" +"jsliterals.h" "5" +"launcherinterface.cpp" "5" +"launcherinterface.h" "5" +"launcherpackets.cpp" "5" +"launcherpackets.h" "5" +"launchersocket.cpp" "5" +"launchersocket.h" "5" +"msvcinfo.cpp" "5" +"msvcinfo.h" "5" +"pathutils.h" "5" +"persistence.cpp" "5" +"persistence.h" "5" +"preferences.cpp" "5" +"processresult.cpp" "5" +"processresult_p.h" "5" +"processutils.cpp" "5" +"processutils.h" "5" +"profile.cpp" "5" +"profiling.cpp" "5" +"profiling.h" "5" +"progressobserver.cpp" "5" +"progressobserver.h" "5" +"projectgeneratormanager.cpp" "5" +"qbsassert.cpp" "5" +"qbsassert.h" "5" +"qbspluginmanager.cpp" "5" +"qbspluginmanager.h" "5" +"qbsprocess.cpp" "5" +"qbsprocess.h" "5" +"qttools.cpp" "5" +"qttools.h" "5" +"scannerpluginmanager.cpp" "5" +"scannerpluginmanager.h" "5" +"scripttools.cpp" "5" +"scripttools.h" "5" +"set.h" "5" +"settings.cpp" "5" +"settingscreator.cpp" "5" +"settingscreator.h" "5" +"settingsmodel.cpp" "5" +"settingsrepresentation.cpp" "5" +"settingsrepresentation.h" "5" +"setupprojectparameters.cpp" "5" +"shellutils.cpp" "5" +"shellutils.h" "5" +"stlutils.h" "5" +"stringconstants.h" "5" +"stringutils.h" "5" +"toolchains.cpp" "5" +"version.cpp" "5" +"visualstudioversioninfo.cpp" "5" +"visualstudioversioninfo.h" "5" +"vsenvironmentdetector.cpp" "5" +"vsenvironmentdetector.h" "5" +"weakpointer.h" "5" "tools (macOS)" "4" "corelib.qbs:485" "5" -"tools" "5" -"applecodesignutils.cpp" "6" -"applecodesignutils.h" "6" +"applecodesignutils.cpp" "5" +"applecodesignutils.h" "5" "use_installed.pri" "4" "corelib.qbs:494" "5" "qbs_version.pri" "6" @@ -13144,59 +13126,57 @@ "visualstudio.qbs:4" "4" "MSBuild Object Model" "4" "visualstudio.qbs:49" "5" -"msbuild" "5" -"imsbuildgroup.cpp" "6" -"imsbuildgroup.h" "6" -"imsbuildnode.cpp" "6" -"imsbuildnode.h" "6" -"imsbuildnodevisitor.h" "6" -"imsbuildproperty.cpp" "6" -"imsbuildproperty.h" "6" -"msbuildimport.cpp" "6" -"msbuildimport.h" "6" -"msbuildimportgroup.cpp" "6" -"msbuildimportgroup.h" "6" -"msbuilditem.cpp" "6" -"msbuilditem.h" "6" -"msbuilditemdefinitiongroup.cpp" "6" -"msbuilditemdefinitiongroup.h" "6" -"msbuilditemgroup.cpp" "6" -"msbuilditemgroup.h" "6" -"msbuilditemmetadata.cpp" "6" -"msbuilditemmetadata.h" "6" -"msbuildproject.cpp" "6" -"msbuildproject.h" "6" -"msbuildproperty.cpp" "6" -"msbuildproperty.h" "6" -"msbuildpropertygroup.cpp" "6" -"msbuildpropertygroup.h" "6" +"imsbuildgroup.cpp" "5" +"imsbuildgroup.h" "5" +"imsbuildnode.cpp" "5" +"imsbuildnode.h" "5" +"imsbuildnodevisitor.h" "5" +"imsbuildproperty.cpp" "5" +"imsbuildproperty.h" "5" +"msbuildimport.cpp" "5" +"msbuildimport.h" "5" +"msbuildimportgroup.cpp" "5" +"msbuildimportgroup.h" "5" +"msbuilditem.cpp" "5" +"msbuilditem.h" "5" +"msbuilditemdefinitiongroup.cpp" "5" +"msbuilditemdefinitiongroup.h" "5" +"msbuilditemgroup.cpp" "5" +"msbuilditemgroup.h" "5" +"msbuilditemmetadata.cpp" "5" +"msbuilditemmetadata.h" "5" +"msbuildproject.cpp" "5" +"msbuildproject.h" "5" +"msbuildproperty.cpp" "5" +"msbuildproperty.h" "5" +"msbuildpropertygroup.cpp" "5" +"msbuildpropertygroup.h" "5" "MSBuild Object Model Items" "4" "visualstudio.qbs:80" "5" -"msbuildclcompile.cpp" "6" -"msbuildclcompile.h" "6" -"msbuildclinclude.cpp" "6" -"msbuildclinclude.h" "6" -"msbuildfileitem.cpp" "6" -"msbuildfileitem.h" "6" -"msbuildfilter.cpp" "6" -"msbuildfilter.h" "6" -"msbuildlink.cpp" "6" -"msbuildlink.h" "6" -"msbuildnone.cpp" "6" -"msbuildnone.h" "6" +"msbuildclcompile.cpp" "5" +"msbuildclcompile.h" "5" +"msbuildclinclude.cpp" "5" +"msbuildclinclude.h" "5" +"msbuildfileitem.cpp" "5" +"msbuildfileitem.h" "5" +"msbuildfilter.cpp" "5" +"msbuildfilter.h" "5" +"msbuildlink.cpp" "5" +"msbuildlink.h" "5" +"msbuildnone.cpp" "5" +"msbuildnone.h" "5" "Solution Object Model" "4" "visualstudio.qbs:33" "5" -"solution" "5" -"ivisualstudiosolutionproject.cpp" "6" -"ivisualstudiosolutionproject.h" "6" -"visualstudiosolution.cpp" "6" -"visualstudiosolution.h" "6" -"visualstudiosolutionfileproject.cpp" "6" -"visualstudiosolutionfileproject.h" "6" -"visualstudiosolutionfolderproject.cpp" "6" -"visualstudiosolutionfolderproject.h" "6" -"visualstudiosolutionglobalsection.cpp" "6" -"visualstudiosolutionglobalsection.h" "6" +"ivisualstudiosolutionproject.cpp" "5" +"ivisualstudiosolutionproject.h" "5" +"visualstudiosolution.cpp" "5" +"visualstudiosolution.h" "5" +"visualstudiosolutionfileproject.cpp" "5" +"visualstudiosolutionfileproject.h" "5" +"visualstudiosolutionfolderproject.cpp" "5" +"visualstudiosolutionfolderproject.h" "5" +"visualstudiosolutionglobalsection.cpp" "5" +"visualstudiosolutionglobalsection.h" "5" "Visual Studio generator" "4" "visualstudio.qbs:11" "5" "msbuildfiltersproject.cpp" "5" @@ -13218,11 +13198,10 @@ "visualstudioguidpool.h" "5" "Visual Studio Object Model I/O" "4" "visualstudio.qbs:98" "5" -"io" "5" -"msbuildprojectwriter.cpp" "6" -"msbuildprojectwriter.h" "6" -"visualstudiosolutionwriter.cpp" "6" -"visualstudiosolutionwriter.h" "6" +"msbuildprojectwriter.cpp" "5" +"msbuildprojectwriter.h" "5" +"visualstudiosolutionwriter.cpp" "5" +"visualstudiosolutionwriter.h" "5" "visualstudiogeneratorplugin.cpp" "4" "qbs resources" "2" "share.qbs:7" "3" @@ -13596,119 +13575,118 @@ "clangbackend.qbs:3" "3" "Group 3" "3" "clangbackend.qbs:9" "4" -"source" "4" -"clangasyncjob.h" "5" -"clangbackend_global.h" "5" -"clangclock.h" "5" -"clangcodecompleteresults.cpp" "5" -"clangcodecompleteresults.h" "5" -"clangcodemodelserver.cpp" "5" -"clangcodemodelserver.h" "5" -"clangcompletecodejob.cpp" "5" -"clangcompletecodejob.h" "5" -"clangdocument.cpp" "5" -"clangdocument.h" "5" -"clangdocumentjob.h" "5" -"clangdocumentprocessor.cpp" "5" -"clangdocumentprocessor.h" "5" -"clangdocumentprocessors.cpp" "5" -"clangdocumentprocessors.h" "5" -"clangdocuments.cpp" "5" -"clangdocuments.h" "5" -"clangdocumentsuspenderresumer.cpp" "5" -"clangdocumentsuspenderresumer.h" "5" -"clangexceptions.cpp" "5" -"clangexceptions.h" "5" -"clangfilepath.cpp" "5" -"clangfilepath.h" "5" -"clangfilesystemwatcher.cpp" "5" -"clangfilesystemwatcher.h" "5" -"clangfollowsymbol.cpp" "5" -"clangfollowsymbol.h" "5" -"clangfollowsymboljob.cpp" "5" -"clangfollowsymboljob.h" "5" -"clangiasyncjob.cpp" "5" -"clangiasyncjob.h" "5" -"clangjobcontext.cpp" "5" -"clangjobcontext.h" "5" -"clangjobqueue.cpp" "5" -"clangjobqueue.h" "5" -"clangjobrequest.cpp" "5" -"clangjobrequest.h" "5" -"clangjobs.cpp" "5" -"clangjobs.h" "5" -"clangparsesupportivetranslationunitjob.cpp" "5" -"clangparsesupportivetranslationunitjob.h" "5" -"clangreferencescollector.cpp" "5" -"clangreferencescollector.h" "5" -"clangrequestannotationsjob.cpp" "5" -"clangrequestannotationsjob.h" "5" -"clangrequestreferencesjob.cpp" "5" -"clangrequestreferencesjob.h" "5" -"clangrequesttooltipjob.cpp" "5" -"clangrequesttooltipjob.h" "5" -"clangresumedocumentjob.cpp" "5" -"clangresumedocumentjob.h" "5" -"clangstring.h" "5" -"clangsupportivetranslationunitinitializer.cpp" "5" -"clangsupportivetranslationunitinitializer.h" "5" -"clangsuspenddocumentjob.cpp" "5" -"clangsuspenddocumentjob.h" "5" -"clangtooltipinfocollector.cpp" "5" -"clangtooltipinfocollector.h" "5" -"clangtranslationunit.cpp" "5" -"clangtranslationunit.h" "5" -"clangtranslationunits.cpp" "5" -"clangtranslationunits.h" "5" -"clangtranslationunitupdater.cpp" "5" -"clangtranslationunitupdater.h" "5" -"clangtype.cpp" "5" -"clangtype.h" "5" -"clangunsavedfilesshallowarguments.cpp" "5" -"clangunsavedfilesshallowarguments.h" "5" -"clangupdateannotationsjob.cpp" "5" -"clangupdateannotationsjob.h" "5" -"clangupdateextraannotationsjob.cpp" "5" -"clangupdateextraannotationsjob.h" "5" -"codecompleter.cpp" "5" -"codecompleter.h" "5" -"codecompletionchunkconverter.cpp" "5" -"codecompletionchunkconverter.h" "5" -"codecompletionsextractor.cpp" "5" -"codecompletionsextractor.h" "5" -"commandlinearguments.cpp" "5" -"commandlinearguments.h" "5" -"cursor.cpp" "5" -"cursor.h" "5" -"diagnostic.cpp" "5" -"diagnostic.h" "5" -"diagnosticset.cpp" "5" -"diagnosticset.h" "5" -"diagnosticsetiterator.h" "5" -"fixit.cpp" "5" -"fixit.h" "5" -"fulltokeninfo.cpp" "5" -"fulltokeninfo.h" "5" -"projectpart.cpp" "5" -"projectpart.h" "5" -"projects.cpp" "5" -"projects.h" "5" -"skippedsourceranges.cpp" "5" -"skippedsourceranges.h" "5" -"sourcelocation.cpp" "5" -"sourcelocation.h" "5" -"sourcerange.cpp" "5" -"sourcerange.h" "5" -"tokeninfo.cpp" "5" -"tokeninfo.h" "5" -"tokenprocessor.h" "5" -"tokenprocessoriterator.h" "5" -"unsavedfile.cpp" "5" -"unsavedfile.h" "5" -"unsavedfiles.cpp" "5" -"unsavedfiles.h" "5" -"utf8positionfromlinecolumn.cpp" "5" -"utf8positionfromlinecolumn.h" "5" +"clangasyncjob.h" "4" +"clangbackend_global.h" "4" +"clangclock.h" "4" +"clangcodecompleteresults.cpp" "4" +"clangcodecompleteresults.h" "4" +"clangcodemodelserver.cpp" "4" +"clangcodemodelserver.h" "4" +"clangcompletecodejob.cpp" "4" +"clangcompletecodejob.h" "4" +"clangdocument.cpp" "4" +"clangdocument.h" "4" +"clangdocumentjob.h" "4" +"clangdocumentprocessor.cpp" "4" +"clangdocumentprocessor.h" "4" +"clangdocumentprocessors.cpp" "4" +"clangdocumentprocessors.h" "4" +"clangdocuments.cpp" "4" +"clangdocuments.h" "4" +"clangdocumentsuspenderresumer.cpp" "4" +"clangdocumentsuspenderresumer.h" "4" +"clangexceptions.cpp" "4" +"clangexceptions.h" "4" +"clangfilepath.cpp" "4" +"clangfilepath.h" "4" +"clangfilesystemwatcher.cpp" "4" +"clangfilesystemwatcher.h" "4" +"clangfollowsymbol.cpp" "4" +"clangfollowsymbol.h" "4" +"clangfollowsymboljob.cpp" "4" +"clangfollowsymboljob.h" "4" +"clangiasyncjob.cpp" "4" +"clangiasyncjob.h" "4" +"clangjobcontext.cpp" "4" +"clangjobcontext.h" "4" +"clangjobqueue.cpp" "4" +"clangjobqueue.h" "4" +"clangjobrequest.cpp" "4" +"clangjobrequest.h" "4" +"clangjobs.cpp" "4" +"clangjobs.h" "4" +"clangparsesupportivetranslationunitjob.cpp" "4" +"clangparsesupportivetranslationunitjob.h" "4" +"clangreferencescollector.cpp" "4" +"clangreferencescollector.h" "4" +"clangrequestannotationsjob.cpp" "4" +"clangrequestannotationsjob.h" "4" +"clangrequestreferencesjob.cpp" "4" +"clangrequestreferencesjob.h" "4" +"clangrequesttooltipjob.cpp" "4" +"clangrequesttooltipjob.h" "4" +"clangresumedocumentjob.cpp" "4" +"clangresumedocumentjob.h" "4" +"clangstring.h" "4" +"clangsupportivetranslationunitinitializer.cpp" "4" +"clangsupportivetranslationunitinitializer.h" "4" +"clangsuspenddocumentjob.cpp" "4" +"clangsuspenddocumentjob.h" "4" +"clangtooltipinfocollector.cpp" "4" +"clangtooltipinfocollector.h" "4" +"clangtranslationunit.cpp" "4" +"clangtranslationunit.h" "4" +"clangtranslationunits.cpp" "4" +"clangtranslationunits.h" "4" +"clangtranslationunitupdater.cpp" "4" +"clangtranslationunitupdater.h" "4" +"clangtype.cpp" "4" +"clangtype.h" "4" +"clangunsavedfilesshallowarguments.cpp" "4" +"clangunsavedfilesshallowarguments.h" "4" +"clangupdateannotationsjob.cpp" "4" +"clangupdateannotationsjob.h" "4" +"clangupdateextraannotationsjob.cpp" "4" +"clangupdateextraannotationsjob.h" "4" +"codecompleter.cpp" "4" +"codecompleter.h" "4" +"codecompletionchunkconverter.cpp" "4" +"codecompletionchunkconverter.h" "4" +"codecompletionsextractor.cpp" "4" +"codecompletionsextractor.h" "4" +"commandlinearguments.cpp" "4" +"commandlinearguments.h" "4" +"cursor.cpp" "4" +"cursor.h" "4" +"diagnostic.cpp" "4" +"diagnostic.h" "4" +"diagnosticset.cpp" "4" +"diagnosticset.h" "4" +"diagnosticsetiterator.h" "4" +"fixit.cpp" "4" +"fixit.h" "4" +"fulltokeninfo.cpp" "4" +"fulltokeninfo.h" "4" +"projectpart.cpp" "4" +"projectpart.h" "4" +"projects.cpp" "4" +"projects.h" "4" +"skippedsourceranges.cpp" "4" +"skippedsourceranges.h" "4" +"sourcelocation.cpp" "4" +"sourcelocation.h" "4" +"sourcerange.cpp" "4" +"sourcerange.h" "4" +"tokeninfo.cpp" "4" +"tokeninfo.h" "4" +"tokenprocessor.h" "4" +"tokenprocessoriterator.h" "4" +"unsavedfile.cpp" "4" +"unsavedfile.h" "4" +"unsavedfiles.cpp" "4" +"unsavedfiles.h" "4" +"utf8positionfromlinecolumn.cpp" "4" +"utf8positionfromlinecolumn.h" "4" "Group 4" "3" "clangbackend.qbs:17" "4" "crashhandlersetup.cpp" "5" @@ -13724,26 +13702,25 @@ "clangpchmanagerbackend.qbs:4" "3" "Group 3" "3" "clangpchmanagerbackend.qbs:36" "4" -"source" "4" -"clangpchmanagerbackend_global.h" "5" -"collectincludesaction.h" "5" -"collectincludespreprocessorcallbacks.h" "5" -"collectincludestoolaction.h" "5" -"environment.h" "5" -"includecollector.cpp" "5" -"includecollector.h" "5" -"pchcreator.cpp" "5" -"pchcreator.h" "5" -"pchcreatorinterface.h" "5" -"pchgenerator.h" "5" -"pchgeneratorinterface.h" "5" -"pchgeneratornotifierinterface.h" "5" -"pchmanagerserver.cpp" "5" -"pchmanagerserver.h" "5" -"pchnotcreatederror.h" "5" -"projectparts.cpp" "5" -"projectparts.h" "5" -"projectpartsinterface.h" "5" +"clangpchmanagerbackend_global.h" "4" +"collectincludesaction.h" "4" +"collectincludespreprocessorcallbacks.h" "4" +"collectincludestoolaction.h" "4" +"environment.h" "4" +"includecollector.cpp" "4" +"includecollector.h" "4" +"pchcreator.cpp" "4" +"pchcreator.h" "4" +"pchcreatorinterface.h" "4" +"pchgenerator.h" "4" +"pchgeneratorinterface.h" "4" +"pchgeneratornotifierinterface.h" "4" +"pchmanagerserver.cpp" "4" +"pchmanagerserver.h" "4" +"pchnotcreatederror.h" "4" +"projectparts.cpp" "4" +"projectparts.h" "4" +"projectpartsinterface.h" "4" "sources from clangrefactoring" "3" "clangpchmanagerbackend.qbs:61" "4" "clangtool.cpp" "5" @@ -13759,65 +13736,64 @@ "clangrefactoringbackend.qbs:4" "3" "Group 3" "3" "clangrefactoringbackend.qbs:31" "4" -"source" "4" -"clangquery.cpp" "5" -"clangquery.h" "5" -"clangquerygatherer.cpp" "5" -"clangquerygatherer.h" "5" -"clangrefactoringbackend_global.h" "5" -"clangtool.cpp" "5" -"clangtool.h" "5" -"collectmacrospreprocessorcallbacks.h" "5" -"collectmacrossourcefilecallbacks.cpp" "5" -"collectmacrossourcefilecallbacks.h" "5" -"collectsymbolsaction.cpp" "5" -"collectsymbolsaction.h" "5" -"filestatus.h" "5" -"filestatuscache.cpp" "5" -"filestatuscache.h" "5" -"findcursorusr.h" "5" -"findlocationsofusrs.h" "5" -"findusrforcursoraction.cpp" "5" -"findusrforcursoraction.h" "5" -"indexdataconsumer.cpp" "5" -"indexdataconsumer.h" "5" -"locationsourcefilecallbacks.cpp" "5" -"locationsourcefilecallbacks.h" "5" -"macropreprocessorcallbacks.cpp" "5" -"macropreprocessorcallbacks.h" "5" -"projectpartartefact.cpp" "5" -"projectpartartefact.h" "5" -"projectpartartefactexception.h" "5" -"projectpartentry.h" "5" -"refactoringcompilationdatabase.cpp" "5" -"refactoringcompilationdatabase.h" "5" -"refactoringserver.cpp" "5" -"refactoringserver.h" "5" -"sourcedependency.h" "5" -"sourcelocationentry.h" "5" -"sourcelocationsutils.h" "5" -"sourcerangeextractor.cpp" "5" -"sourcerangeextractor.h" "5" -"sourcerangefilter.cpp" "5" -"sourcerangefilter.h" "5" -"storagesqlitestatementfactory.h" "5" -"symbolentry.h" "5" -"symbolfinder.cpp" "5" -"symbolfinder.h" "5" -"symbolindexer.cpp" "5" -"symbolindexer.h" "5" -"symbolindexing.cpp" "5" -"symbolindexing.h" "5" -"symbolindexinginterface.h" "5" -"symbollocationfinderaction.cpp" "5" -"symbollocationfinderaction.h" "5" -"symbolscollector.cpp" "5" -"symbolscollector.h" "5" -"symbolscollectorinterface.h" "5" -"symbolstorage.h" "5" -"symbolstorageinterface.h" "5" -"symbolsvisitorbase.h" "5" -"usedmacro.h" "5" +"clangquery.cpp" "4" +"clangquery.h" "4" +"clangquerygatherer.cpp" "4" +"clangquerygatherer.h" "4" +"clangrefactoringbackend_global.h" "4" +"clangtool.cpp" "4" +"clangtool.h" "4" +"collectmacrospreprocessorcallbacks.h" "4" +"collectmacrossourcefilecallbacks.cpp" "4" +"collectmacrossourcefilecallbacks.h" "4" +"collectsymbolsaction.cpp" "4" +"collectsymbolsaction.h" "4" +"filestatus.h" "4" +"filestatuscache.cpp" "4" +"filestatuscache.h" "4" +"findcursorusr.h" "4" +"findlocationsofusrs.h" "4" +"findusrforcursoraction.cpp" "4" +"findusrforcursoraction.h" "4" +"indexdataconsumer.cpp" "4" +"indexdataconsumer.h" "4" +"locationsourcefilecallbacks.cpp" "4" +"locationsourcefilecallbacks.h" "4" +"macropreprocessorcallbacks.cpp" "4" +"macropreprocessorcallbacks.h" "4" +"projectpartartefact.cpp" "4" +"projectpartartefact.h" "4" +"projectpartartefactexception.h" "4" +"projectpartentry.h" "4" +"refactoringcompilationdatabase.cpp" "4" +"refactoringcompilationdatabase.h" "4" +"refactoringserver.cpp" "4" +"refactoringserver.h" "4" +"sourcedependency.h" "4" +"sourcelocationentry.h" "4" +"sourcelocationsutils.h" "4" +"sourcerangeextractor.cpp" "4" +"sourcerangeextractor.h" "4" +"sourcerangefilter.cpp" "4" +"sourcerangefilter.h" "4" +"storagesqlitestatementfactory.h" "4" +"symbolentry.h" "4" +"symbolfinder.cpp" "4" +"symbolfinder.h" "4" +"symbolindexer.cpp" "4" +"symbolindexer.h" "4" +"symbolindexing.cpp" "4" +"symbolindexing.h" "4" +"symbolindexinginterface.h" "4" +"symbollocationfinderaction.cpp" "4" +"symbollocationfinderaction.h" "4" +"symbolscollector.cpp" "4" +"symbolscollector.h" "4" +"symbolscollectorinterface.h" "4" +"symbolstorage.h" "4" +"symbolstorageinterface.h" "4" +"symbolsvisitorbase.h" "4" +"usedmacro.h" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -14172,8 +14148,7 @@ "c99.qbs:4" "4" "Data Files" "4" "c99.qbs:11" "5" -"data" "5" -"designatedInitializer.1.c" "6" +"designatedInitializer.1.c" "5" "Source Files" "4" "c99.qbs:6" "5" "tst_c99.cpp" "5" @@ -14262,36 +14237,35 @@ "preprocessor.qbs:4" "4" "Data files" "4" "preprocessor.qbs:11" "5" -"data" "5" -"empty-macro.2.cpp" "6" -"empty-macro.2.out.cpp" "6" -"empty-macro.cpp" "6" -"empty-macro.out.cpp" "6" -"identifier-expansion.1.cpp" "6" -"identifier-expansion.1.out.cpp" "6" -"identifier-expansion.2.cpp" "6" -"identifier-expansion.2.out.cpp" "6" -"identifier-expansion.3.cpp" "6" -"identifier-expansion.3.out.cpp" "6" -"identifier-expansion.4.cpp" "6" -"identifier-expansion.4.out.cpp" "6" -"identifier-expansion.5.cpp" "6" -"identifier-expansion.5.out.cpp" "6" -"macro-test.cpp" "6" -"macro-test.out.cpp" "6" -"macro_expand.c" "6" -"macro_expand.out.c" "6" -"macro_expand_1.cpp" "6" -"macro_expand_1.out.cpp" "6" -"macro_pounder_fn.c" "6" -"noPP.1.cpp" "6" -"noPP.2.cpp" "6" -"poundpound.1.cpp" "6" -"poundpound.1.out.cpp" "6" -"recursive.1.cpp" "6" -"recursive.1.out.cpp" "6" -"reserved.1.cpp" "6" -"reserved.1.out.cpp" "6" +"empty-macro.2.cpp" "5" +"empty-macro.2.out.cpp" "5" +"empty-macro.cpp" "5" +"empty-macro.out.cpp" "5" +"identifier-expansion.1.cpp" "5" +"identifier-expansion.1.out.cpp" "5" +"identifier-expansion.2.cpp" "5" +"identifier-expansion.2.out.cpp" "5" +"identifier-expansion.3.cpp" "5" +"identifier-expansion.3.out.cpp" "5" +"identifier-expansion.4.cpp" "5" +"identifier-expansion.4.out.cpp" "5" +"identifier-expansion.5.cpp" "5" +"identifier-expansion.5.out.cpp" "5" +"macro-test.cpp" "5" +"macro-test.out.cpp" "5" +"macro_expand.c" "5" +"macro_expand.out.c" "5" +"macro_expand_1.cpp" "5" +"macro_expand_1.out.cpp" "5" +"macro_pounder_fn.c" "5" +"noPP.1.cpp" "5" +"noPP.2.cpp" "5" +"poundpound.1.cpp" "5" +"poundpound.1.out.cpp" "5" +"recursive.1.cpp" "5" +"recursive.1.out.cpp" "5" +"reserved.1.cpp" "5" +"reserved.1.out.cpp" "5" "Source Files" "4" "preprocessor.qbs:6" "5" "tst_preprocessor.cpp" "5" @@ -14347,13 +14321,12 @@ "cxx11.qbs:4" "4" "Data Files" "4" "cxx11.qbs:11" "5" -"data" "5" -"inlineNamespace.1.cpp" "6" -"inlineNamespace.1.errors.txt" "6" -"noExcept.1.cpp" "6" -"noExcept.1.errors.txt" "6" -"staticAssert.1.cpp" "6" -"staticAssert.1.errors.txt" "6" +"inlineNamespace.1.cpp" "5" +"inlineNamespace.1.errors.txt" "5" +"noExcept.1.cpp" "5" +"noExcept.1.errors.txt" "5" +"staticAssert.1.cpp" "5" +"staticAssert.1.errors.txt" "5" "Source Files" "4" "cxx11.qbs:6" "5" "tst_cxx11.cpp" "5" @@ -14369,14 +14342,14 @@ "dumpers.qbs:3" "4" "Sources from Debugger plugin" "4" "dumpers.qbs:8" "5" -"debuggerprotocol.cpp" "6" -"debuggerprotocol.h" "6" -"simplifytype.cpp" "6" -"simplifytype.h" "6" -"watchdata.cpp" "6" -"watchdata.h" "6" -"watchutils.cpp" "6" -"watchutils.h" "6" +"debuggerprotocol.cpp" "5" +"debuggerprotocol.h" "5" +"simplifytype.cpp" "5" +"simplifytype.h" "5" +"watchdata.cpp" "5" +"watchdata.h" "5" +"watchutils.cpp" "5" +"watchutils.h" "5" "standard pch file (gui)" "4" "QtcProduct.qbs:65" "5" "qtcreator_gui_pch.h" "6" @@ -14390,7 +14363,7 @@ "disassembler.qbs:3" "4" "Sources from Debugger plugin" "4" "disassembler.qbs:5" "5" -"disassemblerlines.cpp" "6" +"disassemblerlines.cpp" "5" "standard pch file (gui)" "4" "QtcProduct.qbs:65" "5" "qtcreator_gui_pch.h" "6" @@ -14404,7 +14377,7 @@ "gdb.qbs:3" "4" "Sources from Debugger plugin" "4" "gdb.qbs:7" "5" -"debuggerprotocol.cpp" "6" +"debuggerprotocol.cpp" "5" "standard pch file (gui)" "4" "QtcProduct.qbs:65" "5" "qtcreator_gui_pch.h" "6" @@ -14418,13 +14391,13 @@ "namedemangler.qbs:3" "4" "Sources from Debugger plugin" "4" "namedemangler.qbs:8" "5" -"demanglerexceptions.h" "6" -"globalparsestate.cpp" "6" -"globalparsestate.h" "6" -"namedemangler.cpp" "6" -"namedemangler.h" "6" -"parsetreenodes.cpp" "6" -"parsetreenodes.h" "6" +"demanglerexceptions.h" "5" +"globalparsestate.cpp" "5" +"globalparsestate.h" "5" +"namedemangler.cpp" "5" +"namedemangler.h" "5" +"parsetreenodes.cpp" "5" +"parsetreenodes.h" "5" "standard pch file (gui)" "4" "QtcProduct.qbs:65" "5" "qtcreator_gui_pch.h" "6" @@ -14449,7 +14422,7 @@ "simplifytypes.qbs:3" "4" "Sources from Debugger plugin" "4" "simplifytypes.qbs:6" "5" -"simplifytype.cpp" "6" +"simplifytype.cpp" "5" "standard pch file (gui)" "4" "QtcProduct.qbs:65" "5" "qtcreator_gui_pch.h" "6" @@ -14565,8 +14538,8 @@ "externaltool.qbs:3" "3" "Duplicated sources from Core plugin" "3" "externaltool.qbs:8" "4" -"externaltool.cpp" "5" -"externaltool.h" "5" +"externaltool.cpp" "4" +"externaltool.h" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -14595,14 +14568,14 @@ "specificrules.qbs:3" "4" "Sources from TextEditor plugin" "4" "specificrules.qbs:6" "5" -"context.cpp" "6" -"dynamicrule.cpp" "6" -"highlightdefinition.cpp" "6" -"itemdata.cpp" "6" -"keywordlist.cpp" "6" -"progressdata.cpp" "6" -"rule.cpp" "6" -"specificrules.cpp" "6" +"context.cpp" "5" +"dynamicrule.cpp" "5" +"highlightdefinition.cpp" "5" +"itemdata.cpp" "5" +"keywordlist.cpp" "5" +"progressdata.cpp" "5" +"rule.cpp" "5" +"specificrules.cpp" "5" "standard pch file (gui)" "4" "QtcProduct.qbs:65" "5" "qtcreator_gui_pch.h" "6" @@ -14623,24 +14596,24 @@ "textdocumentlayout.h" "5" "Sources from TextEditor plugin" "4" "highlighterengine.qbs:8" "5" -"context.cpp" "6" -"context.h" "6" -"dynamicrule.cpp" "6" -"dynamicrule.h" "6" -"highlightdefinition.cpp" "6" -"highlightdefinition.h" "6" -"highlighter.cpp" "6" -"highlighter.h" "6" -"itemdata.cpp" "6" -"itemdata.h" "6" -"keywordlist.cpp" "6" -"keywordlist.h" "6" -"progressdata.cpp" "6" -"progressdata.h" "6" -"rule.cpp" "6" -"rule.h" "6" -"specificrules.cpp" "6" -"specificrules.h" "6" +"context.cpp" "5" +"context.h" "5" +"dynamicrule.cpp" "5" +"dynamicrule.h" "5" +"highlightdefinition.cpp" "5" +"highlightdefinition.h" "5" +"highlighter.cpp" "5" +"highlighter.h" "5" +"itemdata.cpp" "5" +"itemdata.h" "5" +"keywordlist.cpp" "5" +"keywordlist.h" "5" +"progressdata.cpp" "5" +"progressdata.h" "5" +"rule.cpp" "5" +"rule.h" "5" +"specificrules.cpp" "5" +"specificrules.h" "5" "standard pch file (gui)" "4" "QtcProduct.qbs:65" "5" "qtcreator_gui_pch.h" "6" @@ -14674,25 +14647,25 @@ "profilewriter.qbs:3" "3" "Sources from ProParser" "3" "profilewriter.qbs:6" "4" -"ioutils.cpp" "5" -"ioutils.h" "5" -"profileevaluator.cpp" "5" -"profileevaluator.h" "5" -"proitems.cpp" "5" -"proitems.h" "5" -"prowriter.cpp" "5" -"prowriter.h" "5" -"qmake_global.h" "5" -"qmakebuiltins.cpp" "5" -"qmakeevaluator.cpp" "5" -"qmakeevaluator.h" "5" -"qmakeevaluator_p.h" "5" -"qmakeglobals.cpp" "5" -"qmakeglobals.h" "5" -"qmakeparser.cpp" "5" -"qmakeparser.h" "5" -"qmakevfs.cpp" "5" -"qmakevfs.h" "5" +"ioutils.cpp" "4" +"ioutils.h" "4" +"profileevaluator.cpp" "4" +"profileevaluator.h" "4" +"proitems.cpp" "4" +"proitems.h" "4" +"prowriter.cpp" "4" +"prowriter.h" "4" +"qmake_global.h" "4" +"qmakebuiltins.cpp" "4" +"qmakeevaluator.cpp" "4" +"qmakeevaluator.h" "4" +"qmakeevaluator_p.h" "4" +"qmakeglobals.cpp" "4" +"qmakeglobals.h" "4" +"qmakeparser.cpp" "4" +"qmakeparser.h" "4" +"qmakevfs.cpp" "4" +"qmakevfs.h" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:65" "4" "qtcreator_gui_pch.h" "5" @@ -14787,12 +14760,12 @@ "fileformat.qbs:3" "5" "Files from QmlProjectManager" "5" "fileformat.qbs:9" "6" -"filefilteritems.cpp" "7" -"filefilteritems.h" "7" -"qmlprojectfileformat.cpp" "7" -"qmlprojectfileformat.h" "7" -"qmlprojectitem.cpp" "7" -"qmlprojectitem.h" "7" +"filefilteritems.cpp" "6" +"filefilteritems.h" "6" +"qmlprojectfileformat.cpp" "6" +"qmlprojectfileformat.h" "6" +"qmlprojectitem.cpp" "6" +"qmlprojectitem.h" "6" "standard pch file (gui)" "5" "QtcProduct.qbs:65" "6" "qtcreator_gui_pch.h" "7" From 652596dc16718875d20d62657c32e7b0abdb4822 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 21 Apr 2020 13:30:44 +0300 Subject: [PATCH 07/41] QmlDesigner: Update UI when an asset is reimported Item library thumbnail and navigator icon are refreshed if asset is reimported, and the puppet is restarted in case the asset is in use. Change-Id: Ic5577eff3a24bcce87b504e9c059c29f6cb887a5 Fixes: QDS-1957 Reviewed-by: Thomas Hartmann --- .../itemLibraryQmlSources/ItemDelegate.qml | 2 ++ .../components/edit3d/edit3dview.cpp | 11 +++++++++++ .../qmldesigner/components/edit3d/edit3dview.h | 1 + .../importmanager/importmanagerview.cpp | 2 -- .../itemlibrary/itemlibraryassetimporter.cpp | 18 ++++++++++++------ .../navigator/navigatormodelinterface.h | 1 + .../navigator/navigatortreemodel.cpp | 5 +++++ .../components/navigator/navigatortreemodel.h | 1 + .../components/navigator/navigatorview.cpp | 11 +++++++++++ .../components/navigator/navigatorview.h | 2 ++ .../metainfo/subcomponentmanager.cpp | 3 +-- 11 files changed, 47 insertions(+), 10 deletions(-) diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml index 37f97126785..cd3ddef34db 100644 --- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml +++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml @@ -47,6 +47,8 @@ Item { width: itemLibraryIconWidth // to be set in Qml context height: itemLibraryIconHeight // to be set in Qml context source: itemLibraryIconPath // to be set by model + + cache: false // Allow thumbnail to be dynamically updated } Text { diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp index c8e1e222e54..52a286a16ab 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp @@ -179,6 +179,17 @@ void Edit3DView::importsChanged(const QList &addedImports, checkImports(); } +void Edit3DView::customNotification(const AbstractView *view, const QString &identifier, + const QList &nodeList, const QList &data) +{ + Q_UNUSED(view) + Q_UNUSED(nodeList) + Q_UNUSED(data) + + if (identifier == "asset_import_update") + resetPuppet(); +} + void Edit3DView::sendInputEvent(QInputEvent *e) const { if (nodeInstanceView()) diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.h b/src/plugins/qmldesigner/components/edit3d/edit3dview.h index d1646470b75..6c3ae892a91 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dview.h +++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.h @@ -58,6 +58,7 @@ public: void modelAttached(Model *model) override; void modelAboutToBeDetached(Model *model) override; void importsChanged(const QList &addedImports, const QList &removedImports) override; + void customNotification(const AbstractView *view, const QString &identifier, const QList &nodeList, const QList &data) override; void sendInputEvent(QInputEvent *e) const; void edit3DViewResized(const QSize &size) const; diff --git a/src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp b/src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp index df9590af646..f26178c4562 100644 --- a/src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp +++ b/src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp @@ -87,8 +87,6 @@ void ImportManagerView::importsChanged(const QList &/*addedImports*/, co void ImportManagerView::possibleImportsChanged(const QList &/*possibleImports*/) { - QmlDesignerPlugin::instance()->currentDesignDocument()->updateSubcomponentManager(); - if (m_importsWidget) m_importsWidget->setPossibleImports(model()->possibleImports()); } diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp index 34fa71222d6..374de839189 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp @@ -512,18 +512,24 @@ void ItemLibraryAssetImporter::finalizeQuick3DImport() addInfo(progressTitle); notifyProgress(0, progressTitle); - // There is an inbuilt delay before rewriter change actually updates the data model, - // so we need to wait for a moment to allow the change to take effect. + // First we have to wait a while to ensure qmljs detects new files and updates its + // internal model. Then we make a non-change to the document to trigger qmljs snapshot + // update. There is an inbuilt delay before rewriter change actually updates the data + // model, so we need to wait for another moment to allow the change to take effect. // Otherwise subsequent subcomponent manager update won't detect new imports properly. QTimer *timer = new QTimer(parent()); static int counter; counter = 0; - timer->callOnTimeout([this, timer, progressTitle, model]() { + timer->callOnTimeout([this, timer, progressTitle, model, doc]() { if (!isCancelled()) { - notifyProgress(++counter * 10, progressTitle); - if (counter >= 10) { - // Trigger underlying qmljs snapshot update by making a non-change to the doc + notifyProgress(++counter * 5, progressTitle); + if (counter == 10) { model->rewriterView()->textModifier()->replace(0, 0, {}); + } else if (counter == 19) { + doc->updateSubcomponentManager(); + } else if (counter >= 20) { + if (!m_overwrittenImports.isEmpty()) + model->rewriterView()->emitCustomNotification("asset_import_update"); timer->stop(); notifyFinished(); } diff --git a/src/plugins/qmldesigner/components/navigator/navigatormodelinterface.h b/src/plugins/qmldesigner/components/navigator/navigatormodelinterface.h index bedcc2f561a..d560eb2824a 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatormodelinterface.h +++ b/src/plugins/qmldesigner/components/navigator/navigatormodelinterface.h @@ -43,6 +43,7 @@ public: virtual void notifyModelNodesRemoved(const QList &modelNodes) = 0; virtual void notifyModelNodesInserted(const QList &modelNodes) = 0; virtual void notifyModelNodesMoved(const QList &modelNodes) = 0; + virtual void notifyIconsChanged() = 0; virtual void setFilter(bool showObjects) = 0; virtual void resetModel() = 0; }; diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index c91ff78626f..70d2e405f9d 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -695,6 +695,11 @@ void NavigatorTreeModel::notifyModelNodesMoved(const QList &modelNode emit layoutChanged(indexes); } +void NavigatorTreeModel::notifyIconsChanged() +{ + emit dataChanged(index(0, 0), index(rowCount(), 0), {Qt::DecorationRole}); +} + void NavigatorTreeModel::setFilter(bool showOnlyVisibleItems) { m_showOnlyVisibleItems = showOnlyVisibleItems; diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h index f10198adcc0..15e89d36367 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h @@ -87,6 +87,7 @@ public: void notifyModelNodesRemoved(const QList &modelNodes) override; void notifyModelNodesInserted(const QList &modelNodes) override; void notifyModelNodesMoved(const QList &modelNodes) override; + void notifyIconsChanged() override; void setFilter(bool showOnlyVisibleItems) override; void resetModel() override; diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index 86404e0ea0a..e953d6b6df5 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -147,6 +147,17 @@ void NavigatorView::bindingPropertiesChanged(const QList & prop } } +void NavigatorView::customNotification(const AbstractView *view, const QString &identifier, + const QList &nodeList, const QList &data) +{ + Q_UNUSED(view) + Q_UNUSED(nodeList) + Q_UNUSED(data) + + if (identifier == "asset_import_update") + m_currentModelInterface->notifyIconsChanged(); +} + void NavigatorView::handleChangedExport(const ModelNode &modelNode, bool exported) { const ModelNode rootNode = rootModelNode(); diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.h b/src/plugins/qmldesigner/components/navigator/navigatorview.h index 852dddc70fc..529d263d407 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.h +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.h @@ -84,6 +84,8 @@ public: void bindingPropertiesChanged(const QList &propertyList, PropertyChangeFlags) override; + void customNotification(const AbstractView *view, const QString &identifier, const QList &nodeList, const QList &data) override; + void handleChangedExport(const ModelNode &modelNode, bool exported); bool isNodeInvisible(const ModelNode &modelNode) const; diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp index ff65187f46e..b4b043847e2 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp @@ -420,8 +420,7 @@ void SubComponentManager::parseQuick3DAssetDir(const QString &assetPath) itemLibraryEntry.addHints(hints); } - if (!model()->metaInfo().itemLibraryInfo()->containsEntry(itemLibraryEntry)) - model()->metaInfo().itemLibraryInfo()->addEntries({itemLibraryEntry}); + model()->metaInfo().itemLibraryInfo()->addEntries({itemLibraryEntry}, true); } } } From 0cac09e757251cf77050dcd789a4f10aefeec2a2 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 21 Apr 2020 15:12:22 +0300 Subject: [PATCH 08/41] QmlDesigner: Fix importing existing asset with different capitalization In case sensitive file systems, revert to old capitalization after reimporting existing asset with different capitalization. Change-Id: If26443b34e408c84aeb12940262c8b9f696f0bbf Fixes: QDS-1958 Reviewed-by: Thomas Hartmann --- .../itemlibrary/itemlibraryassetimporter.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp index 374de839189..0f484a11324 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp @@ -280,7 +280,16 @@ void ItemLibraryAssetImporter::parseQuick3DAsset(const QString &file, const QVar return; } + QString originalAssetName = assetName; if (targetDir.exists(assetName)) { + // If we have a file system with case insensitive filenames, assetName may be + // different from the existing name. Modify assetName to ensure exact match to + // the overwritten old asset capitalization + const QStringList assetDirs = targetDir.entryList({assetName}, QDir::Dirs); + if (assetDirs.size() == 1) { + assetName = assetDirs[0]; + targetDirPath = targetDir.filePath(assetName); + } if (!confirmAssetOverwrite(assetName)) { addWarning(tr("Skipped import of existing asset: \"%1\"").arg(assetName)); return; @@ -306,6 +315,13 @@ void ItemLibraryAssetImporter::parseQuick3DAsset(const QString &file, const QVar return; } + if (originalAssetName != assetName) { + // Fix the generated qml file name + const QString assetQml = originalAssetName + ".qml"; + if (outDir.exists(assetQml)) + outDir.rename(assetQml, assetName + ".qml"); + } + QHash assetFiles; const int outDirPathSize = outDir.path().size(); auto insertAsset = [&](const QString &filePath) { From d39f89d13bab9abeb431eb4d6508300dc82f6c6e Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 21 Apr 2020 16:45:48 +0300 Subject: [PATCH 09/41] QmlDesigner: Reset quick3D importer between each file Quick3D importer caches various things when it does the import, making reusing the instance for multiple imports error prone. Change-Id: I6e8e3dedf579683cdda58624172395a392f4e567 Fixes: QDS-1960 Reviewed-by: Thomas Hartmann --- .../components/itemlibrary/itemlibraryassetimporter.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp index 0f484a11324..6a5edb18a39 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp @@ -315,6 +315,9 @@ void ItemLibraryAssetImporter::parseQuick3DAsset(const QString &file, const QVar return; } + // The importer is reset after every import to avoid issues with it caching various things + m_quick3DAssetImporter.reset(new QSSGAssetImportManager); + if (originalAssetName != assetName) { // Fix the generated qml file name const QString assetQml = originalAssetName + ".qml"; From 031d12cc5acc9f7464d1ad0cae93c834b7eeb2b9 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 23 Apr 2020 11:33:59 +0300 Subject: [PATCH 10/41] QmlDesigner: Fix importing asset when open doc is in project subfolder Change-Id: I9853dd9c6b919d2061e77bee12bfc6345848c846 Fixes: QDS-1823 Reviewed-by: Thomas Hartmann --- .../itemlibraryassetimportdialog.cpp | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp index 3f403d03133..0beb5bce729 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp @@ -32,6 +32,9 @@ #include "utils/outputformatter.h" #include "theme.h" +#include +#include + #include #include #include @@ -97,6 +100,20 @@ ItemLibraryAssetImportDialog::ItemLibraryAssetImportDialog(const QStringList &im ui->buttonBox->button(QDialogButtonBox::Close)->setDefault(true); + QStringList importPaths; + auto doc = QmlDesignerPlugin::instance()->currentDesignDocument(); + if (doc) { + Model *model = doc->currentModel(); + if (model) + importPaths = model->importPaths(); + } + + QString targetDir = defaulTargetDirectory; + + ProjectExplorer::Project *currentProject = ProjectExplorer::SessionManager::projectForFile(doc->fileName()); + if (currentProject) + targetDir = currentProject->projectDirectory().toString(); + // Import is always done under known folder. The order of preference for folder is: // 1) An existing QUICK_3D_ASSETS_FOLDER under DEFAULT_ASSET_IMPORT_FOLDER project import path // 2) An existing QUICK_3D_ASSETS_FOLDER under any project import path @@ -105,19 +122,11 @@ ItemLibraryAssetImportDialog::ItemLibraryAssetImportDialog(const QStringList &im // 5) New QUICK_3D_ASSETS_FOLDER under new DEFAULT_ASSET_IMPORT_FOLDER under project const QString defaultAssetFolder = QLatin1String(Constants::DEFAULT_ASSET_IMPORT_FOLDER); const QString quick3DFolder = QLatin1String(Constants::QUICK_3D_ASSETS_FOLDER); - QString candidatePath = defaulTargetDirectory + defaultAssetFolder + quick3DFolder; + QString candidatePath = targetDir + defaultAssetFolder + quick3DFolder; int candidatePriority = 5; - QStringList importPaths; - - auto doc = QmlDesignerPlugin::instance()->currentDesignDocument(); - if (doc) { - Model *model = doc->currentModel(); - if (model) - importPaths = model->importPaths(); - } for (auto importPath : qAsConst(importPaths)) { - if (importPath.startsWith(defaulTargetDirectory)) { + if (importPath.startsWith(targetDir)) { const bool isDefaultFolder = importPath.endsWith(defaultAssetFolder); const QString assetFolder = importPath + quick3DFolder; const bool exists = QFileInfo(assetFolder).exists(); From 49626f7ea9085d167ea822b5fda6170e3949a1fc Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 23 Apr 2020 09:07:52 +0200 Subject: [PATCH 11/41] CMake build: Fix devel package issues Include paths and headers were missing for building a separator Qt Quick Designer plugin. Task-number: QTCREATORBUG-23778 Change-Id: Ib6ba96ad42a8b2b36e0ee2f0e3c51c27f3365d37 Reviewed-by: Cristian Adam --- cmake/QtCreatorAPI.cmake | 6 +++++- src/libs/qmljs/CMakeLists.txt | 1 + src/plugins/qmldesigner/CMakeLists.txt | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 82f7897b6d5..993102e139a 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -229,7 +229,11 @@ function(set_public_includes target includes) if (NOT IS_ABSOLUTE ${inc_dir}) set(inc_dir "${CMAKE_CURRENT_SOURCE_DIR}/${inc_dir}") endif() - target_include_directories(${target} PUBLIC $) + file(RELATIVE_PATH include_dir_relative_path ${PROJECT_SOURCE_DIR} ${inc_dir}) + target_include_directories(${target} PUBLIC + $ + $ + ) endforeach() endfunction() diff --git a/src/libs/qmljs/CMakeLists.txt b/src/libs/qmljs/CMakeLists.txt index 2c05b662c3b..243966afdad 100644 --- a/src/libs/qmljs/CMakeLists.txt +++ b/src/libs/qmljs/CMakeLists.txt @@ -7,6 +7,7 @@ add_qtc_library(QmlJS parser/qmljsast.cpp parser/qmljsast_p.h parser/qmljsastfwd_p.h parser/qmljsastvisitor.cpp parser/qmljsastvisitor_p.h + parser/qmljsdiagnosticmessage_p.h parser/qmljsengine_p.cpp parser/qmljsengine_p.h parser/qmljsglobal_p.h parser/qmljsgrammar.cpp parser/qmljsgrammar_p.h diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index 42feb7c13f7..75a8571b818 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -144,6 +144,7 @@ extend_qtc_plugin(QmlDesigner extend_qtc_plugin(QmlDesigner SOURCES_PREFIX ../../../share/qtcreator/qml/qmlpuppet/interfaces + PUBLIC_INCLUDES ../../../share/qtcreator/qml/qmlpuppet/interfaces SOURCES nodeinstanceserverinterface.cpp commondefines.h @@ -202,6 +203,7 @@ extend_qtc_plugin(QmlDesigner extend_qtc_plugin(QmlDesigner SOURCES_PREFIX components/formeditor + PUBLIC_INCLUDES components/formeditor SOURCES abstractcustomtool.cpp abstractcustomtool.h abstractformeditortool.cpp abstractformeditortool.h @@ -257,6 +259,7 @@ extend_qtc_plugin(QmlDesigner extend_qtc_plugin(QmlDesigner SOURCES_PREFIX components/integration + PUBLIC_INCLUDES components/integration SOURCES componentaction.cpp componentaction.h componentview.cpp componentview.h @@ -470,6 +473,7 @@ extend_qtc_plugin(QmlDesigner extend_qtc_plugin(QmlDesigner SOURCES_PREFIX designercore + PUBLIC_INCLUDES designercore SOURCES metainfo/itemlibraryinfo.cpp metainfo/metainfo.cpp From 8d868d8bbb174256e4501f8ad6f40ddc24150f3b Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 23 Apr 2020 01:33:42 +0200 Subject: [PATCH 12/41] QmlDesigner: use setContextProperties should be faster Change-Id: I3f491237746856c00f13947dfa9e8464a2bd5c25 Reviewed-by: Thomas Hartmann --- .../itemlibrary/itemlibrarywidget.cpp | 16 +++++++++------- .../propertyeditorqmlbackend.cpp | 19 +++++++++++++------ .../stateseditor/stateseditorwidget.cpp | 9 ++++++--- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp index 378f1e897ae..13230544ae5 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp @@ -101,13 +101,15 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) : m_itemViewQuickWidget->engine()->addImportPath(propertyEditorResourcesPath() + "/imports"); m_itemLibraryModel = new ItemLibraryModel(this); - QQmlContext *rootContext = m_itemViewQuickWidget->rootContext(); - rootContext->setContextProperty(QStringLiteral("itemLibraryModel"), m_itemLibraryModel.data()); - rootContext->setContextProperty(QStringLiteral("itemLibraryIconWidth"), m_itemIconSize.width()); - rootContext->setContextProperty(QStringLiteral("itemLibraryIconHeight"), m_itemIconSize.height()); - rootContext->setContextProperty(QStringLiteral("rootView"), this); - - m_itemViewQuickWidget->rootContext()->setContextProperty(QStringLiteral("highlightColor"), Utils::StyleHelper::notTooBrightHighlightColor()); + m_itemViewQuickWidget->rootContext()->setContextProperties( + QVector{ + {"itemLibraryModel", QVariant::fromValue(m_itemLibraryModel.data())}, + {"itemLibraryIconWidth", m_itemIconSize.width()}, + {"itemLibraryIconHeight", m_itemIconSize.height()}, + {"rootView", QVariant::fromValue(this)}, + {"highlightColor", Utils::StyleHelper::notTooBrightHighlightColor()} + } + ); /* create Resources view and its model */ m_resourcesFileSystemModel = new CustomFileSystemModel(this); diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp index d9a685c7032..42ad8857cf0 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp @@ -379,9 +379,12 @@ void PropertyEditorQmlBackend::setup(const QmlObjectNode &qmlObjectNode, const Q // anchors m_backendAnchorBinding.setup(qmlObjectNode.modelNode()); - context()->setContextProperty(QLatin1String("anchorBackend"), &m_backendAnchorBinding); - - context()->setContextProperty(QLatin1String("transaction"), m_propertyEditorTransaction.data()); + context()->setContextProperties( + QVector{ + {"anchorBackend", QVariant::fromValue(&m_backendAnchorBinding)}, + {"transaction", QVariant::fromValue(m_propertyEditorTransaction.data())} + } + ); qCInfo(propertyEditorBenchmark) << "anchors:" << time.elapsed(); @@ -457,9 +460,13 @@ void PropertyEditorQmlBackend::initialSetup(const TypeName &typeName, const QUrl QObject::connect(valueObject, &PropertyEditorValue::valueChanged, &backendValuesPropertyMap(), &DesignerPropertyMap::valueChanged); m_backendValuesPropertyMap.insert(QLatin1String("id"), QVariant::fromValue(valueObject)); - context()->setContextProperty(QLatin1String("anchorBackend"), &m_backendAnchorBinding); - context()->setContextProperty(QLatin1String("modelNodeBackend"), &m_backendModelNode); - context()->setContextProperty(QLatin1String("transaction"), m_propertyEditorTransaction.data()); + context()->setContextProperties( + QVector{ + {"anchorBackend", QVariant::fromValue(&m_backendAnchorBinding)}, + {"modelNodeBackend", QVariant::fromValue(&m_backendModelNode)}, + {"transaction", QVariant::fromValue(m_propertyEditorTransaction.data())} + } + ); contextObject()->setSpecificsUrl(qmlSpecificsFile); diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp index dafe5f3ff26..b3098b93604 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp @@ -102,9 +102,12 @@ StatesEditorWidget::StatesEditorWidget(StatesEditorView *statesEditorView, State setResizeMode(QQuickWidget::SizeRootObjectToView); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - rootContext()->setContextProperty(QStringLiteral("statesEditorModel"), statesEditorModel); - - rootContext()->setContextProperty(QLatin1String("canAddNewStates"), true); + rootContext()->setContextProperties( + QVector{ + {"statesEditorModel", QVariant::fromValue(statesEditorModel)}, + {"canAddNewStates", true} + } + ); Theme::setupTheme(engine()); From 23ce744407776fc847ec5ae37f032ee5a4cdf87c Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 23 Apr 2020 02:32:57 +0200 Subject: [PATCH 13/41] QmlDesigner: cleanup ItemLibrary a bit Change-Id: Ib3b35e68434e94a8dde10653881fc765e449beb1 Reviewed-by: Tim Jenssen --- .../components/itemlibrary/itemlibrarymodel.cpp | 5 ----- .../components/itemlibrary/itemlibrarymodel.h | 13 +++---------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp index f708ba0c617..020369708ae 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp @@ -238,11 +238,6 @@ QMimeData *ItemLibraryModel::getMimeData(const ItemLibraryEntry &itemLibraryEntr return mimeData; } -QList ItemLibraryModel::sections() const -{ - return m_sections; -} - void ItemLibraryModel::clearSections() { qDeleteAll(m_sections); diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h index 5d39a000856..bdbad139330 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h @@ -58,17 +58,8 @@ public: QMimeData *getMimeData(const ItemLibraryEntry &itemLibraryEntry); - QList sections() const; - - void clearSections(); - static void registerQmlTypes(); - int visibleSectionCount() const; - QList visibleSections() const; - - ItemLibrarySection *sectionByName(const QString §ionName); - void setSearchText(const QString &searchText); void setExpanded(bool, const QString §ion); @@ -80,13 +71,15 @@ signals: void searchTextChanged(); private: // functions + ItemLibrarySection *sectionByName(const QString §ionName); void updateVisibility(bool *changed); void addRoleNames(); void sortSections(); + void clearSections(); private: // variables - QList m_sections; + QList> m_sections; QHash m_roleNames; QString m_searchText; From 77c3e7d2d4476e05033306fb50bf6a451a00cb94 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 23 Apr 2020 04:53:21 +0200 Subject: [PATCH 14/41] languageutils: improve ComponentVersion::toString After benchmarking it on a i7 it was 20% faster in release. (in debug even more) Change-Id: Ibf4599813c2e3bc206ea77dea7fc972018554b09 Reviewed-by: Thomas Hartmann --- src/libs/languageutils/componentversion.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libs/languageutils/componentversion.cpp b/src/libs/languageutils/componentversion.cpp index 3c7759d2327..8cfd46aa56e 100644 --- a/src/libs/languageutils/componentversion.cpp +++ b/src/libs/languageutils/componentversion.cpp @@ -73,8 +73,12 @@ bool ComponentVersion::isValid() const QString ComponentVersion::toString() const { - return QString::fromLatin1("%1.%2").arg(QString::number(_major), - QString::number(_minor)); + QByteArray temp; + QByteArray result; + result += temp.setNum(_major); + result += '.'; + result += temp.setNum(_minor); + return QString::fromLatin1(result); } void ComponentVersion::addToHash(QCryptographicHash &hash) const From 1f8fccea5c5ea0d4915f7be4a013eaf85f064556 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 23 Apr 2020 04:53:57 +0200 Subject: [PATCH 15/41] qmldesigner: no need to use QString Change-Id: Ia60a0ef4d802a87cb8b7743b678d224c83ba2234 Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 8aacefff55d..4abf7d28023 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -650,7 +650,7 @@ PropertyName NodeMetaInfoPrivate::defaultPropertyName() const static inline TypeName stringIdentifier( const TypeName &type, int maj, int min) { - return type + QString::number(maj).toLatin1() + '_' + QString::number(min).toLatin1(); + return type + QByteArray::number(maj) + '_' + QByteArray::number(min); } NodeMetaInfoPrivate::Pointer NodeMetaInfoPrivate::create(Model *model, const TypeName &type, int major, int minor) From a37b6ae5fcf70c2401d1952573b8fa9672c5f201 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 23 Apr 2020 09:09:13 +0200 Subject: [PATCH 16/41] QmlDesigner: crash workaround Disable the timer to be safe. The issue is bothering us for a very long time and we were not able to find the real cause. Task-number: QDS-343 Task-number: QDS-1984 Task-number: QTCREATORBUG-20364 Change-Id: I5023f27be25ba7971db80990eeb9562fd63dc15d Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/designersettings.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/qmldesigner/designersettings.cpp b/src/plugins/qmldesigner/designersettings.cpp index 4944cef9db2..c2ec2106d1a 100644 --- a/src/plugins/qmldesigner/designersettings.cpp +++ b/src/plugins/qmldesigner/designersettings.cpp @@ -84,6 +84,7 @@ void DesignerSettings::fromSettings(QSettings *settings) ); restoreValue(settings, DesignerSettingsKey::SIMPLE_COLOR_PALETTE_CONTENT, QStringList()); restoreValue(settings, DesignerSettingsKey::ALWAYS_DESIGN_MODE, true); + restoreValue(settings, DesignerSettingsKey::DISABLE_ITEM_LIBRARY_UPDATE_TIMER, true); settings->endGroup(); settings->endGroup(); From 169c3bb30c84ce804a5921751629ee96cae4917d Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 23 Apr 2020 10:49:05 +0200 Subject: [PATCH 17/41] Doc: Fix path to image files Change-Id: I8f9395bd5d8c5ae02e1bb994577b02c80c4c2564 Reviewed-by: Tim Jenssen --- doc/qtdesignstudio/config/qtdesignstudio.qdocconf | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf index 0574bbed10b..5040c9fd06d 100644 --- a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf +++ b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf @@ -23,6 +23,7 @@ imagedirs = ../images \ ../../../src/plugins/help/images \ ../../../src/plugins/projectexplorer/images \ ../../../src/plugins/qmldesigner/components/componentcore/images \ + ../../../src/plugins/qmldesigner/components/edit3d/images \ ../../../src/plugins/qmldesigner/components/formeditor \ ../../../src/plugins/qmldesigner/components/navigator \ ../../../src/plugins/qmldesigner/components/timelineeditor/images \ From 2aac4cc07f5c794a8b0e97709925a6d3169866b3 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Fri, 17 Apr 2020 08:53:16 +0200 Subject: [PATCH 18/41] CMake: honor use jom instead of nmake setting Only search for the jom cmake generator if this setting is enabled. Change-Id: Id8eed91d47f1f6ca2375fe0d169b21168c5ca4ff Reviewed-by: Tobias Hunger --- .../cmakekitinformation.cpp | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp index 88f4b7726fb..4a998fb468a 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp @@ -33,10 +33,12 @@ #include #include #include -#include -#include #include #include +#include +#include +#include +#include #include #include #include @@ -643,6 +645,21 @@ QVariant CMakeGeneratorKitAspect::defaultValue(const Kit *k) const return g.matches("NMake Makefiles", extraGenerator) || g.matches("NMake Makefiles JOM", extraGenerator); }); + if (ProjectExplorerPlugin::projectExplorerSettings().useJom) { + it = std::find_if(known.constBegin(), + known.constEnd(), + [extraGenerator](const CMakeTool::Generator &g) { + return g.matches("NMake Makefiles JOM", extraGenerator); + }); + } + + if (it == known.constEnd()) { + it = std::find_if(known.constBegin(), + known.constEnd(), + [extraGenerator](const CMakeTool::Generator &g) { + return g.matches("NMake Makefiles", extraGenerator); + }); + } } } else { // Unix-oid OSes: From e3a0fe71e4ac34f805a03ccd81e09b4e3fb35a78 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Fri, 17 Apr 2020 09:06:28 +0200 Subject: [PATCH 19/41] CMake: fixup env if jom is missing Add the applitcation dir path to the path environment variable if jom cannot be found there. This should fix the cannot find jom error for binary releases since we ship jom with qc. Fixes: QTCREATORBUG-22645 Change-Id: Ia3b55f794d3ac4b5fd6d2e85cf19f00bd8cddd2c Reviewed-by: Tobias Hunger --- .../cmakeprojectmanager/cmakekitinformation.cpp | 10 ++++++++++ src/plugins/cmakeprojectmanager/cmakekitinformation.h | 1 + 2 files changed, 11 insertions(+) diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp index 4a998fb468a..0e0d47cb5f0 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp @@ -787,6 +787,16 @@ KitAspectWidget *CMakeGeneratorKitAspect::createConfigWidget(Kit *k) const return new CMakeGeneratorKitAspectWidget(k, this); } +void CMakeGeneratorKitAspect::addToEnvironment(const Kit *k, Utils::Environment &env) const +{ + GeneratorInfo info = generatorInfo(k); + if (info.generator == "NMake Makefiles JOM") { + if (env.searchInPath("jom.exe").exists()) + return; + env.appendOrSetPath(QCoreApplication::applicationDirPath()); + } +} + // -------------------------------------------------------------------- // CMakeConfigurationKitAspect: // -------------------------------------------------------------------- diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.h b/src/plugins/cmakeprojectmanager/cmakekitinformation.h index f4901721d6c..f2579f3282c 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.h +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.h @@ -83,6 +83,7 @@ public: void upgrade(ProjectExplorer::Kit *k) final; ItemList toUserOutput(const ProjectExplorer::Kit *k) const final; ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *k) const final; + void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const final; private: QVariant defaultValue(const ProjectExplorer::Kit *k) const; From dee0997d388c4f9674b07303904bfe740e3bfecb Mon Sep 17 00:00:00 2001 From: David Schulz Date: Fri, 3 Apr 2020 15:03:26 +0200 Subject: [PATCH 20/41] QmlJSEditor: jump to file under cursor if it exists Don't limit this functionality to files that are part of the snapshot, but try to open all files. This will allow opening c++ files defined in a qbs project file. Fixes: QTCREATORBUG-22685 Change-Id: If2a2a2075e5d7113a7bb44625c0f29ef66138d3c Reviewed-by: Denis Shienkov Reviewed-by: Christian Kandeler --- src/plugins/qmljseditor/qmljseditor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index 9f1799eef27..16aaa6ec47f 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -791,7 +791,7 @@ void QmlJSEditorWidget::findLinkAt(const QTextCursor &cursor, const QString relative = QString::fromLatin1("%1/%2").arg( semanticInfo.document->path(), text); - if (semanticInfo.snapshot.document(relative)) { + if (QFileInfo::exists(relative)) { link.targetFileName = relative; processLinkCallback(link); return; From bbed542ec3a231931e15f68332dcbcc624531ce6 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 22 Apr 2020 20:25:13 +0200 Subject: [PATCH 21/41] QmlDesigner: Expose typeFilter property Change-Id: Iaf0c6db67eb25b730bc31f87b52b0ec93ab15266 Reviewed-by: Thomas Hartmann --- .../imports/HelperWidgets/EditableListView.qml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml index 5b0a61d5c0c..e1d177fe074 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml @@ -51,6 +51,8 @@ Rectangle { property real __actionIndicatorWidth: StudioTheme.Values.squareComponentWidth property real __actionIndicatorHeight: StudioTheme.Values.height + property string typeFilter: "QtQuick3D.Material" + color: "transparent" border.color: StudioTheme.Values.themeControlOutline border.width: StudioTheme.Values.border @@ -69,7 +71,7 @@ Rectangle { validator: RegExpValidator { regExp: /(^[a-z_]\w*|^[A-Z]\w*\.{1}([a-z_]\w*\.?)+)/ } actionIndicatorVisible: false - typeFilter: "QtQuick3D.Material" + typeFilter: editableListView.typeFilter editText: modelData initialModelData: modelData From d02f5664e53df41ff7156eb46069e339479074d2 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 23 Apr 2020 15:59:14 +0200 Subject: [PATCH 22/41] ClangTools: Avoid accessing deleted run worker Change-Id: I74b977ede0d153ae4f8d85e03090dfc21facd04b Reviewed-by: hjk --- src/plugins/clangtools/clangtool.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp index 7536f57ad9a..87ce2875f79 100644 --- a/src/plugins/clangtools/clangtool.cpp +++ b/src/plugins/clangtools/clangtool.cpp @@ -698,6 +698,7 @@ void ClangTool::startTool(ClangTool::FileSelection fileSelection, connect(m_runWorker, &ClangToolRunWorker::started, this, &ClangTool::onStarted); connect(m_runWorker, &ClangToolRunWorker::runnerFinished, this, &ClangTool::updateForCurrentState); + connect(m_runControl, &RunControl::destroyed, [this](){ m_runWorker = nullptr; }); // More init and UI update m_diagnosticFilterModel->setProject(project); @@ -1038,6 +1039,8 @@ void ClangTool::onRunControlStopped() void ClangTool::update() { updateForInitialState(); + if (!m_runWorker) + return; updateForCurrentState(); } From 51993ea62d9e2d004e368999ef8fbddca6ae0034 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 23 Apr 2020 17:50:17 +0300 Subject: [PATCH 23/41] QmlDesigner: Fix import removal issues Fixes the issue of removing all versions of import when one is removed via item library. Also fixes a bug in item library that allowed removal of used imports in some situations, such as directly after another import was removed. Change-Id: I0ad879c8be708873b716fe6326655bcbc66a566a Fixes: QDS-1989 Reviewed-by: Thomas Hartmann --- .../importmanager/importmanagerview.cpp | 6 ++++- .../filemanager/changeimportsvisitor.cpp | 23 +++++++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp b/src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp index f26178c4562..c2bce0b0ce5 100644 --- a/src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp +++ b/src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp @@ -81,8 +81,12 @@ void ImportManagerView::modelAboutToBeDetached(Model *model) void ImportManagerView::importsChanged(const QList &/*addedImports*/, const QList &/*removedImports*/) { - if (m_importsWidget) + if (m_importsWidget) { m_importsWidget->setImports(model()->imports()); + // setImports recreates labels, so we need to update used imports, as it is not guaranteed + // usedImportsChanged notification will come after this. + m_importsWidget->setUsedImports(model()->usedImports()); + } } void ImportManagerView::possibleImportsChanged(const QList &/*possibleImports*/) diff --git a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp index a35ff98ef4b..cc82a5607eb 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp @@ -85,10 +85,25 @@ bool ChangeImportsVisitor::remove(QmlJS::AST::UiProgram *ast, const Import &impo bool ChangeImportsVisitor::equals(QmlJS::AST::UiImport *ast, const Import &import) { + bool equal = false; if (import.isLibraryImport()) - return toString(ast->importUri) == import.url(); + equal = toString(ast->importUri) == import.url(); else if (import.isFileImport()) - return ast->fileName == import.file(); - else - return false; + equal = ast->fileName == import.file(); + + if (equal) { + equal = (!ast->version || (ast->version->minorVersion == 0 && ast->version->majorVersion == 0)) + && import.version().isEmpty(); + if (!equal && ast->version) { + const QStringList versions = import.version().split('.'); + if (versions.size() >= 1 && versions[0].toInt() == ast->version->majorVersion) { + if (versions.size() >= 2) + equal = versions[1].toInt() == ast->version->minorVersion; + else + equal = ast->version->minorVersion == 0; + } + } + } + + return equal; } From 923bd79323eedb982ff9c2fe1cdda6d8e7819a39 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 23 Apr 2020 14:12:15 +0300 Subject: [PATCH 24/41] QmlDesigner: Don't expand the selected node on selection change Point of expanding items at selection change is to ensure the selected item is visible. It is not necessary to also expand the selected item. Change-Id: I2435daf4845b5066ddb41a4aeae71d66e12fd94d Fixes: QDS-1940 Reviewed-by: Thomas Hartmann Reviewed-by: Mahmoud Badri --- .../qmldesigner/components/navigator/navigatorview.cpp | 6 +++--- .../qmldesigner/components/navigator/navigatorview.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index e953d6b6df5..1c2d73be6dc 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -442,7 +442,7 @@ void NavigatorView::updateItemSelection() // make sure selected nodes a visible foreach (const QModelIndex &selectedIndex, itemSelection.indexes()) { if (selectedIndex.column() == 0) - expandRecursively(selectedIndex); + expandAncestors(selectedIndex); } } @@ -466,9 +466,9 @@ bool NavigatorView::blockSelectionChangedSignal(bool block) return oldValue; } -void NavigatorView::expandRecursively(const QModelIndex &index) +void NavigatorView::expandAncestors(const QModelIndex &index) { - QModelIndex currentIndex = index; + QModelIndex currentIndex = index.parent(); while (currentIndex.isValid()) { if (!treeWidget()->isExpanded(currentIndex)) treeWidget()->expand(currentIndex); diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.h b/src/plugins/qmldesigner/components/navigator/navigatorview.h index 529d263d407..3bafe0fa80b 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.h +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.h @@ -110,7 +110,7 @@ protected: //functions QTreeView *treeWidget() const; NavigatorTreeModel *treeModel(); bool blockSelectionChangedSignal(bool block); - void expandRecursively(const QModelIndex &index); + void expandAncestors(const QModelIndex &index); void reparentAndCatch(NodeAbstractProperty property, const ModelNode &modelNode); void setupWidget(); From 6cfe0923010dff9a04ec56a2ea088c6cc7d8a739 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 22 Apr 2020 12:46:56 +0200 Subject: [PATCH 25/41] Fix printing source code After qtbase/4a240bb67e72b34c80af448e0a74846609fa6975, the scaling of the margins changed. Fixes: QTBUG-81121 Change-Id: I6987fe8e25da1771dd2bcd36fff8558fefd3dee0 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/plugins/texteditor/texteditor.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index 61e82f0beaf..a44eb794a2d 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -107,6 +107,7 @@ #include #include #include +#include #include #include #include @@ -1199,7 +1200,11 @@ void TextEditorWidgetPrivate::print(QPrinter *printer) QAbstractTextDocumentLayout *layout = doc->documentLayout(); layout->setPaintDevice(p.device()); +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) int dpiy = p.device()->logicalDpiY(); +#else + int dpiy = qRound(QGuiApplication::primaryScreen()->logicalDotsPerInchY()); +#endif int margin = int((2/2.54)*dpiy); // 2 cm margins QTextFrameFormat fmt = doc->rootFrame()->frameFormat(); From 5d5cd15e1c40ee7f6f91f5718c7fcb4492a52d62 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 24 Apr 2020 06:47:17 +0200 Subject: [PATCH 26/41] QmlDesigner: Fix compile with gcc5.3 Amends 8d868d8bbb1742. Change-Id: Ic8dd8829e6734031ddc49c75c778f3f6566a0acc Reviewed-by: Tim Jenssen --- .../propertyeditor/propertyeditorqmlbackend.cpp | 10 +++++----- .../components/stateseditor/stateseditorwidget.cpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp index 42ad8857cf0..ddded6400bd 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp @@ -381,8 +381,8 @@ void PropertyEditorQmlBackend::setup(const QmlObjectNode &qmlObjectNode, const Q m_backendAnchorBinding.setup(qmlObjectNode.modelNode()); context()->setContextProperties( QVector{ - {"anchorBackend", QVariant::fromValue(&m_backendAnchorBinding)}, - {"transaction", QVariant::fromValue(m_propertyEditorTransaction.data())} + {{"anchorBackend"}, QVariant::fromValue(&m_backendAnchorBinding)}, + {{"transaction"}, QVariant::fromValue(m_propertyEditorTransaction.data())} } ); @@ -462,9 +462,9 @@ void PropertyEditorQmlBackend::initialSetup(const TypeName &typeName, const QUrl context()->setContextProperties( QVector{ - {"anchorBackend", QVariant::fromValue(&m_backendAnchorBinding)}, - {"modelNodeBackend", QVariant::fromValue(&m_backendModelNode)}, - {"transaction", QVariant::fromValue(m_propertyEditorTransaction.data())} + {{"anchorBackend"}, QVariant::fromValue(&m_backendAnchorBinding)}, + {{"modelNodeBackend"}, QVariant::fromValue(&m_backendModelNode)}, + {{"transaction"}, QVariant::fromValue(m_propertyEditorTransaction.data())} } ); diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp index b3098b93604..dee2e864013 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp @@ -104,8 +104,8 @@ StatesEditorWidget::StatesEditorWidget(StatesEditorView *statesEditorView, State rootContext()->setContextProperties( QVector{ - {"statesEditorModel", QVariant::fromValue(statesEditorModel)}, - {"canAddNewStates", true} + {{"statesEditorModel"}, QVariant::fromValue(statesEditorModel)}, + {{"canAddNewStates"}, true} } ); From 081186811d8ce51029b275eb6996e571e3b39ff0 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 23 Apr 2020 19:44:21 +0200 Subject: [PATCH 27/41] qds: remove workaround when qdocconf was somewhere else After moving the QtDesignStudio documentation to the QtCreator repository there is no need for these extra files in the dev packages. Change-Id: I4e24946bb6752403a6ecafb0c474332ad2317b1a Reviewed-by: Eike Ziller Reviewed-by: Leena Miettinen --- .../config/qtdesignstudio.qdocconf | 2 -- scripts/createDevPackage.py | 18 +----------------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf index 5040c9fd06d..1fcda6e66a5 100644 --- a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf +++ b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf @@ -8,8 +8,6 @@ headerdirs = sourcedirs = ../src \ ../examples/doc \ ../../qtcreator/src -# The image folders also need to added by packaging scripts, so inform your -# local release team about any changes you make. imagedirs = ../images \ ../examples/doc/images \ ../../qtcreator/images \ diff --git a/scripts/createDevPackage.py b/scripts/createDevPackage.py index 21f71eef5b5..1c8b85d1437 100755 --- a/scripts/createDevPackage.py +++ b/scripts/createDevPackage.py @@ -67,23 +67,7 @@ source_include_patterns = [ r"^doc/.*$", # include everything under doc/ r"^.*\.pri$", # .pri files in all directories that are looked into r"^.*\.h$", # .h files in all directories that are looked into - r"^.*\.hpp$", # .hpp files in all directories that are looked into - # qtdesignstudio docs are build against dev package, so we need to include some image directories - r"^share/qtcreator/qml/qmlpuppet/mockfiles/images/.*$", - r"^share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/.*$", - r"^src/libs/qmleditorwidgets/images/.*$", - r"^src/libs/utils/images/.*$", - r"^src/plugins/debugger/images/.*$", - r"^src/plugins/diffeditor/images/.*$", - r"^src/plugins/help/images/.*$", - r"^src/plugins/projectexplorer/images/.*$", - r"^src/plugins/qmldesigner/components/componentcore/images/.*$", - r"^src/plugins/qmldesigner/components/timelineeditor/images/.*$", - r"^src/plugins/qmldesigner/qmlpreviewplugin/images/.*$", - r"^src/plugins/texteditor/images/.*$", - # also some single files - r"^src/plugins/qmldesigner/components/formeditor/.*\.png$", - r"^src/plugins/qmldesigner/components/navigator/.*\.png$" + r"^.*\.hpp$" # .hpp files in all directories that are looked into ] build_include_patterns = [ From a2481386850e486af977ad90345426069488cc73 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 24 Apr 2020 12:21:35 +0300 Subject: [PATCH 28/41] QmlDesigner: Make 3D edit view onboarding text translatable Also add a potential related nullptr check. Change-Id: I8c6e4facbdb0c2d94f7c2af54f83eef0eca0b796 Fixes: QDS-1993 Reviewed-by: Mahmoud Badri Reviewed-by: Leena Miettinen --- .../qmldesigner/components/edit3d/edit3dview.cpp | 16 +++++++++------- .../components/edit3d/edit3dwidget.cpp | 11 +++++------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp index 52a286a16ab..9e882be2fde 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp @@ -312,14 +312,16 @@ QVector Edit3DView::rightActions() const void Edit3DView::addQuick3DImport() { - const QList imports = model()->possibleImports(); - for (const auto &import : imports) { - if (import.url() == "QtQuick3D") { - model()->changeImports({import}, {}); + if (model()) { + const QList imports = model()->possibleImports(); + for (const auto &import : imports) { + if (import.url() == "QtQuick3D") { + model()->changeImports({import}, {}); - // Subcomponent manager update needed to make item library entries appear - QmlDesignerPlugin::instance()->currentDesignDocument()->updateSubcomponentManager(); - return; + // Subcomponent manager update needed to make item library entries appear + QmlDesignerPlugin::instance()->currentDesignDocument()->updateSubcomponentManager(); + return; + } } } Core::AsynchronousMessageBox::warning(tr("Failed to Add Import"), diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp index c9482272335..3d0d3f2f640 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp @@ -106,12 +106,11 @@ Edit3DWidget::Edit3DWidget(Edit3DView *view) : // Onboarding label contains instructions for new users how to get 3D content into the project m_onboardingLabel = new QLabel(this); QString labelText = - "No 3D import here yet!

" - "To create a 3D View you need to add the QtQuick3D import to your file.
" - "You can add the import via the QML Imports tab of the Library view, or alternatively click" - " here " - "to add it straight away.

" - "If you want to import 3D assets from another tool, click on the \"Add New Assets...\" button in the Assets tab of the Library view."; + tr("Your file does not import Qt Quick 3D.

" + "To create a 3D view, add the QtQuick3D import to your file in the QML Imports tab of the Library view. Or click" + " here " + "here to add it immediately.

" + "To import 3D assets from another tool, click on the \"Add New Assets...\" button in the Assets tab of the Library view."); m_onboardingLabel->setText(labelText.arg(Utils::creatorTheme()->color(Utils::Theme::TextColorLink).name())); m_onboardingLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); connect(m_onboardingLabel, &QLabel::linkActivated, this, &Edit3DWidget::linkActivated); From 85597f85b0141d71afc604f6bb46a341f2cf8de0 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 24 Apr 2020 10:45:20 +0200 Subject: [PATCH 29/41] QmakeProjectManager: Fix missing run button activation The problem could be reproduced as follows: - open any bigger qmake based project (e.g. QtCreator) - de-activate all kits - activate one kit - wait until the first parse (e.g. Debug build finished) - switch to Profile, and toggle the Shadow build button The toggling re-starts the parsing. The parse guard will not be released in decrementPendingEvaluateFutures() (arguably correct as the parsing as a whole is not done). On enteringing incrementPendingEvaluateFuture() due to the re-start, the guard still guards the parse, but a new guard is created in guardParsingRun(). As this happens while the build system isParsing() is true, the created parse guard will be "non-guarding". On assigning to m_guard, the original guard object will fire and then be replaced by the non-guarding guard, that never fires again, so the the build system will never have hasParsingData(), which is a condition for the run buttons to activate. As a workaround for people running into this issue in 4.12.0: Select 'Run qmake' from the menu (any subproject suffices), and let it finish. Change-Id: If7a55db56ec67bac2635fb9a745b9aaf6ca6a413 Reviewed-by: Christian Kandeler --- src/plugins/qmakeprojectmanager/qmakeproject.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 109b9d3d8e6..00d23d3f75b 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -500,8 +500,13 @@ void QmakeBuildSystem::startAsyncTimer(QmakeProFile::AsyncUpdateDelay delay) void QmakeBuildSystem::incrementPendingEvaluateFutures() { - if (m_pendingEvaluateFuturesCount == 0) - m_guard = guardParsingRun(); + if (m_pendingEvaluateFuturesCount == 0) { + // The guard actually might already guard the project if this + // here is the re-start of a previously aborted parse due to e.g. + // changing build directories while parsing. + if (!m_guard.guardsProject()) + m_guard = guardParsingRun(); + } ++m_pendingEvaluateFuturesCount; m_asyncUpdateFutureInterface.setProgressRange(m_asyncUpdateFutureInterface.progressMinimum(), m_asyncUpdateFutureInterface.progressMaximum() + 1); From d1a7afa28fb1050b7e72cad0aa9ab2ff9dbc5287 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 23 Apr 2020 15:40:41 +0300 Subject: [PATCH 30/41] QmlDesigner: Add "closeup" option to focusObjectToCamera function The closeup option is used for itemlibrary thumbnail generation, where the regular fit produces too small images on most imports. Change-Id: I2901a2e20d100b155111f002b22489df945e9e01 Fixes: QDS-1899 Reviewed-by: Thomas Hartmann Reviewed-by: Mahmoud Badri --- share/qtcreator/qml/qmlpuppet/mockfiles/AxisHelper.qml | 2 +- .../qml/qmlpuppet/mockfiles/EditCameraController.qml | 5 +++-- share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml | 2 +- share/qtcreator/qml/qmlpuppet/mockfiles/IconRenderer3D.qml | 2 +- .../qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp | 6 ++++-- .../qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h | 5 +++-- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/AxisHelper.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/AxisHelper.qml index 7481d242252..7ae7bd44d91 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/AxisHelper.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/AxisHelper.qml @@ -121,7 +121,7 @@ View3D { pick(mouse); if (pickObj) { axisHelperView.editCameraCtrl.focusObject(axisHelperView.selectedNode, - pickObj.cameraRotation, false); + pickObj.cameraRotation, false, false); } else { mouse.accepted = false; } diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/EditCameraController.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/EditCameraController.qml index 207dc941994..20dd112d614 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/EditCameraController.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/EditCameraController.qml @@ -87,14 +87,15 @@ Item { } - function focusObject(targetObject, rotation, updateZoom) + function focusObject(targetObject, rotation, updateZoom, closeUp) { if (!camera) return; camera.eulerRotation = rotation; var newLookAtAndZoom = _generalHelper.focusObjectToCamera( - camera, _defaultCameraLookAtDistance, targetObject, view3d, _zoomFactor, updateZoom); + camera, _defaultCameraLookAtDistance, targetObject, view3d, _zoomFactor, + updateZoom, closeUp); _lookAtPoint = newLookAtAndZoom.toVector3d(); _zoomFactor = newLookAtAndZoom.w; storeCameraState(0); diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml index db8d4fb4eab..6527d06e6e7 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml @@ -146,7 +146,7 @@ Item { if (editView) { var targetNode = selectionBoxes.length > 0 ? selectionBoxes[0].model : null; - cameraControl.focusObject(targetNode, editView.camera.eulerRotation, true); + cameraControl.focusObject(targetNode, editView.camera.eulerRotation, true, false); } } diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/IconRenderer3D.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/IconRenderer3D.qml index b16b27406d9..afaf8481ca6 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/IconRenderer3D.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/IconRenderer3D.qml @@ -42,7 +42,7 @@ Item { function fitAndHideBox() : bool { - cameraControl.focusObject(selectionBox.model, viewCamera.eulerRotation, true); + cameraControl.focusObject(selectionBox.model, viewCamera.eulerRotation, true, true); if (cameraControl._zoomFactor < 0.1) { view3D.importScene.scale = view3D.importScene.scale.times(10); return false; diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp index f99d219c5c5..f62a7e51736 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp @@ -148,7 +148,7 @@ float GeneralHelper::zoomCamera(QQuick3DCamera *camera, float distance, float de // Return value contains new lookAt point (xyz) and zoom factor (w) QVector4D GeneralHelper::focusObjectToCamera(QQuick3DCamera *camera, float defaultLookAtDistance, QQuick3DNode *targetObject, QQuick3DViewport *viewPort, - float oldZoom, bool updateZoom) + float oldZoom, bool updateZoom, bool closeUp) { if (!camera) return QVector4D(0.f, 0.f, 0.f, 1.f); @@ -200,7 +200,9 @@ QVector4D GeneralHelper::focusObjectToCamera(QQuick3DCamera *camera, float defau camera->setPosition(lookAt + newLookVector); - float newZoomFactor = updateZoom ? qBound(.01f, float(maxExtent / 900.), 100.f) : oldZoom; + qreal divisor = closeUp ? 900. : 725.; + + float newZoomFactor = updateZoom ? qBound(.01f, float(maxExtent / divisor), 100.f) : oldZoom; float cameraZoomFactor = zoomCamera(camera, 0, defaultLookAtDistance, lookAt, newZoomFactor, false); return QVector4D(lookAt, cameraZoomFactor); diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h index e9d8e525458..15795ac28bd 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h @@ -66,8 +66,9 @@ public: float defaultLookAtDistance, const QVector3D &lookAt, float zoomFactor, bool relative); Q_INVOKABLE QVector4D focusObjectToCamera(QQuick3DCamera *camera, float defaultLookAtDistance, - QQuick3DNode *targetObject, QQuick3DViewport *viewPort, - float oldZoom, bool updateZoom = true); + QQuick3DNode *targetObject, QQuick3DViewport *viewPort, + float oldZoom, bool updateZoom = true, + bool closeUp = false); Q_INVOKABLE void delayedPropertySet(QObject *obj, int delay, const QString &property, const QVariant& value); Q_INVOKABLE QQuick3DNode *resolvePick(QQuick3DNode *pickNode); From d84bbdb876aff758603e149bfa284ee05e999a35 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 15 Apr 2020 19:29:50 +0200 Subject: [PATCH 31/41] QmlDesigner: Delete dangling transitions when deleting FlowTarget Change-Id: Ic2bf68cd19ced976c5337b02bd9b1889c055f182 Reviewed-by: Tim Jenssen --- .../qmldesigner/designercore/model/qmlobjectnode.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp index e811ca071ea..2597aacf7b0 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp @@ -381,11 +381,19 @@ void QmlObjectNode::destroy() timeline.destroyKeyframesForTarget(subNode); } - if (QmlFlowActionAreaNode::isValidQmlFlowActionAreaNode(modelNode())) - QmlFlowActionAreaNode(modelNode()).destroyTarget(); + bool wasFlowEditorTarget = false; + if (QmlFlowTargetNode::isFlowEditorTarget(modelNode())) { + QmlFlowTargetNode(modelNode()).destroyTargets(); + wasFlowEditorTarget = true; + } removeStateOperationsForChildren(modelNode()); + QmlFlowViewNode root(view()->rootModelNode()); + modelNode().destroy(); + + if (wasFlowEditorTarget && root.isValid()) + root.removeDanglingTransitions(); } void QmlObjectNode::ensureAliasExport() From 63db0f271fd2f9d9136e30e49693a525d60f8549 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 20 Apr 2020 12:57:38 +0200 Subject: [PATCH 32/41] QmlJS: Fix lexer handling of escape sequences Escape sequences inside strings need to get handled explicitly to avoid wrong length and offsets of tokens to avoid follow-up problems while highlighting or symbol interaction. Fixes: QTCREATORBUG-23830 Change-Id: I4ab0b166bbab22ef3b7b54071e128416a14e97e1 Reviewed-by: Eike Ziller Reviewed-by: Ulf Hermann --- src/libs/qmljs/parser/qmljslexer.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/libs/qmljs/parser/qmljslexer.cpp b/src/libs/qmljs/parser/qmljslexer.cpp index ec8bf60a2a7..ef3718da028 100644 --- a/src/libs/qmljs/parser/qmljslexer.cpp +++ b/src/libs/qmljs/parser/qmljslexer.cpp @@ -872,6 +872,7 @@ int Lexer::scanString(ScanStringMode mode) { QChar quote = (mode == TemplateContinuation) ? QChar(TemplateHead) : QChar(mode); bool multilineStringLiteral = false; + bool escaped = false; const QChar *startCode = _codePtr - 1; // in case we just parsed a \r, we need to reset this flag to get things working @@ -880,6 +881,12 @@ int Lexer::scanString(ScanStringMode mode) if (_engine) { while (_codePtr <= _endPtr) { + if (escaped) { // former char started an escape sequence + escaped = false; + _char = *_codePtr++; + ++_currentColumnNumber; + continue; + } if (isLineTerminator()) { if ((quote == QLatin1Char('`') || qmlMode())) break; @@ -887,7 +894,10 @@ int Lexer::scanString(ScanStringMode mode) _errorMessage = QCoreApplication::translate("QmlParser", "Stray newline in string literal"); return T_ERROR; } else if (_char == QLatin1Char('\\')) { - break; + if (mode != DoubleQuote && mode != SingleQuote) + break; + else // otherwise we need to handle an escape sequence + escaped = true; } else if (_char == '$' && quote == QLatin1Char('`')) { break; } else if (_char == quote) { From 20b095c6b4b9bd394a4ad6062a588de5bbf14b52 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 22 Apr 2020 16:06:07 +0200 Subject: [PATCH 33/41] QmlJS: Fix palette support Fixes false positive warnings of having no members and allows to auto-complete its members. Fixes: QTCREATORBUG-23659 Change-Id: I4da43b9d3f005f9c6cc759ec424bf67062beff78 Reviewed-by: Fabian Kosmale Reviewed-by: Eike Ziller Reviewed-by: Ulf Hermann --- src/libs/qmljs/qmljsinterpreter.cpp | 2 ++ src/libs/qmljs/qmljsvalueowner.cpp | 28 ++++++++++++++++++++++++++++ src/libs/qmljs/qmljsvalueowner.h | 1 + 3 files changed, 31 insertions(+) diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp index df6d59c4616..bf13df85455 100644 --- a/src/libs/qmljs/qmljsinterpreter.cpp +++ b/src/libs/qmljs/qmljsinterpreter.cpp @@ -395,6 +395,8 @@ const Value *CppComponentValue::valueForCppName(const QString &typeName) const return valueOwner()->realValue(); } else if (typeName == QLatin1String("QFont")) { return valueOwner()->qmlFontObject(); + } else if (typeName == QLatin1String("QPalette")) { + return valueOwner()->qmlPaletteObject(); } else if (typeName == QLatin1String("QPoint") || typeName == QLatin1String("QPointF") || typeName == QLatin1String("QVector2D")) { diff --git a/src/libs/qmljs/qmljsvalueowner.cpp b/src/libs/qmljs/qmljsvalueowner.cpp index 573ccb2aa1b..d9d33931e2b 100644 --- a/src/libs/qmljs/qmljsvalueowner.cpp +++ b/src/libs/qmljs/qmljsvalueowner.cpp @@ -95,6 +95,7 @@ public: ObjectValue *_mathObject; ObjectValue *_qtObject; ObjectValue *_qmlFontObject; + ObjectValue *_qmlPaletteObject; ObjectValue *_qmlPointObject; ObjectValue *_qmlSizeObject; ObjectValue *_qmlRectObject; @@ -496,6 +497,28 @@ SharedValueOwner::SharedValueOwner(SharedValueOwnerKind kind) _qmlFontObject->setMember(QLatin1String("kerning"), booleanValue()); _qmlFontObject->setMember(QLatin1String("preferShaping"), booleanValue()); + _qmlPaletteObject = newObject(/* prototype = */ nullptr); + _qmlPaletteObject->setClassName(QLatin1String("palette")); + _qmlPaletteObject->setMember(QLatin1String("alternateBase"), colorValue()); + _qmlPaletteObject->setMember(QLatin1String("base"), colorValue()); + _qmlPaletteObject->setMember(QLatin1String("brightText"), colorValue()); + _qmlPaletteObject->setMember(QLatin1String("button"), colorValue()); + _qmlPaletteObject->setMember(QLatin1String("buttonText"), colorValue()); + _qmlPaletteObject->setMember(QLatin1String("dark"), colorValue()); + _qmlPaletteObject->setMember(QLatin1String("highlight"), colorValue()); + _qmlPaletteObject->setMember(QLatin1String("highlightedText"), colorValue()); + _qmlPaletteObject->setMember(QLatin1String("light"), colorValue()); + _qmlPaletteObject->setMember(QLatin1String("link"), colorValue()); + _qmlPaletteObject->setMember(QLatin1String("linkVisited"), colorValue()); + _qmlPaletteObject->setMember(QLatin1String("mid"), colorValue()); + _qmlPaletteObject->setMember(QLatin1String("midlight"), colorValue()); + _qmlPaletteObject->setMember(QLatin1String("shadow"), colorValue()); + _qmlPaletteObject->setMember(QLatin1String("text"), colorValue()); + _qmlPaletteObject->setMember(QLatin1String("toolTipBase"), colorValue()); + _qmlPaletteObject->setMember(QLatin1String("toolTipText"), colorValue()); + _qmlPaletteObject->setMember(QLatin1String("window"), colorValue()); + _qmlPaletteObject->setMember(QLatin1String("windowText"), colorValue()); + _qmlPointObject = newObject(/*prototype =*/ nullptr); _qmlPointObject->setClassName(QLatin1String("Point")); _qmlPointObject->setMember(QLatin1String("x"), numberValue()); @@ -896,6 +919,11 @@ const ObjectValue *ValueOwner::qmlFontObject() return _shared->_qmlFontObject; } +const ObjectValue *ValueOwner::qmlPaletteObject() +{ + return _shared->_qmlPaletteObject; +} + const ObjectValue *ValueOwner::qmlPointObject() { return _shared->_qmlPointObject; diff --git a/src/libs/qmljs/qmljsvalueowner.h b/src/libs/qmljs/qmljsvalueowner.h index 9c5adfe53d5..22f2d49196e 100644 --- a/src/libs/qmljs/qmljsvalueowner.h +++ b/src/libs/qmljs/qmljsvalueowner.h @@ -82,6 +82,7 @@ public: // QML objects const ObjectValue *qmlFontObject(); + const ObjectValue *qmlPaletteObject(); const ObjectValue *qmlPointObject(); const ObjectValue *qmlSizeObject(); const ObjectValue *qmlRectObject(); From f057adcff26355ce1f4a716d218cbc532f3cd192 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 15 Apr 2020 19:30:41 +0200 Subject: [PATCH 34/41] QmlDesigner: Delete all bindings to deleted node When a node is deleted we should remove all bindings to that node. Change-Id: I3a6c3387c535ac8c79bfc83671614ed8abd246a5 Reviewed-by: Tim Jenssen --- src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp index 2597aacf7b0..234872d661f 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp @@ -388,6 +388,8 @@ void QmlObjectNode::destroy() } removeStateOperationsForChildren(modelNode()); + BindingProperty::deleteAllReferencesTo(modelNode()); + QmlFlowViewNode root(view()->rootModelNode()); modelNode().destroy(); From 5578a79953474f5e34b21c7a7b9f5ed4c8d87831 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 24 Apr 2020 13:18:52 +0300 Subject: [PATCH 35/41] QmlDesigner: Fix crash on some operations when done on 3D nodes Added a node validity check on some operations that convert ModelNode to QmlItemNode. Change-Id: Ia60aaa2df71db9fd0e7edbbde11e7f8b11559aa6 Fixes: QDS-1894 Reviewed-by: Mahmoud Badri --- .../componentcore/modelnodeoperations.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index 2c239a8aa94..43efe42069b 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp @@ -311,8 +311,10 @@ void resetSize(const SelectionContext &selectionState) selectionState.view()->executeInTransaction("DesignerActionManager|resetSize",[selectionState](){ foreach (ModelNode node, selectionState.selectedModelNodes()) { QmlItemNode itemNode(node); - itemNode.removeProperty("width"); - itemNode.removeProperty("height"); + if (itemNode.isValid()) { + itemNode.removeProperty("width"); + itemNode.removeProperty("height"); + } } }); } @@ -325,8 +327,10 @@ void resetPosition(const SelectionContext &selectionState) selectionState.view()->executeInTransaction("DesignerActionManager|resetPosition",[selectionState](){ foreach (ModelNode node, selectionState.selectedModelNodes()) { QmlItemNode itemNode(node); - itemNode.removeProperty("x"); - itemNode.removeProperty("y"); + if (itemNode.isValid()) { + itemNode.removeProperty("x"); + itemNode.removeProperty("y"); + } } }); } @@ -348,7 +352,8 @@ void resetZ(const SelectionContext &selectionState) selectionState.view()->executeInTransaction("DesignerActionManager|resetZ",[selectionState](){ foreach (ModelNode node, selectionState.selectedModelNodes()) { QmlItemNode itemNode(node); - itemNode.removeProperty("z"); + if (itemNode.isValid()) + itemNode.removeProperty("z"); } }); } From f71286db98fbc93f415a7d9a6050bc2bc79fdd07 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 23 Apr 2020 10:00:23 +0200 Subject: [PATCH 36/41] Debugger: evaluate expression before assigning when using python dumper Fixes: QTCREATORBUG-23711 Change-Id: Ic386b3e4bdd948e74f52116248de1b33a35fe03a Reviewed-by: hjk Reviewed-by: Christian Stenger --- .../qtcreatorcdbext/qtcreatorcdbextension.cpp | 100 +++++++++++------- src/plugins/debugger/cdb/cdbengine.cpp | 11 +- 2 files changed, 69 insertions(+), 42 deletions(-) diff --git a/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp b/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp index 6bbd71367c0..77e537c275e 100644 --- a/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp +++ b/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp @@ -160,7 +160,7 @@ static const CommandDescription commandDescriptions[] = { {"assign","Assigns a value to a variable in current symbol group.", "[-t token] [-h] \n" "-h Data are hex-encoded, binary data\n" - "-u Data are hex-encoded, UTF16 data" + "-e iname is an hex-encoded expression to be evaluated " }, {"threads","Lists threads in GDBMI format.","[-t token]"}, {"registers","Lists registers in GDBMI format","[-t token]"}, @@ -819,57 +819,77 @@ extern "C" HRESULT CALLBACK assign(CIDebugClient *client, PCSTR argsIn) ExtensionCommandContext exc(client); std::string errorMessage; - bool success = false; bool encoded = false; + bool evaluateExpression = false; int token = 0; - do { - StringList tokens = commandTokens(argsIn, &token); - if (tokens.empty()) { - errorMessage = singleLineUsage(commandDescriptions[CmdAssign]); - break; - } - + StringList tokens = commandTokens(argsIn, &token); + while (!tokens.empty()) { if (tokens.front() == "-h") { encoded = true; tokens.pop_front(); + continue; } - if (tokens.empty()) { - errorMessage = singleLineUsage(commandDescriptions[CmdAssign]); - break; + if (tokens.front() == "-e") { + evaluateExpression = true; + tokens.pop_front(); + continue; } + break; + }; - // Parse 'assign locals.x=5' - const std::string::size_type equalsPos = tokens.front().find('='); - if (equalsPos == std::string::npos) { - errorMessage = singleLineUsage(commandDescriptions[CmdAssign]); - break; - } - const std::string iname = tokens.front().substr(0, equalsPos); - const std::string value = tokens.front().substr(equalsPos + 1, tokens.front().size() - equalsPos - 1); - // get the symbolgroup - int currentFrame = ExtensionContext::instance().symbolGroupFrame(); - if (currentFrame < 0) { - CIDebugControl *control = ExtensionCommandContext::instance()->control(); - DEBUG_STACK_FRAME frame; - if (FAILED(control->GetStackTrace(0, 0, 0, &frame, 1, NULL))) { - errorMessage = "No current frame."; - break; + // Parse 'assign locals.x=5' + const std::string::size_type equalsPos = tokens.empty() ? std::string::npos + : tokens.front().find('='); + if (equalsPos == std::string::npos) { + errorMessage = singleLineUsage(commandDescriptions[CmdAssign]); + } else { + std::string iname = tokens.front().substr(0, equalsPos); + const std::string value = tokens.front().substr(equalsPos + 1, + tokens.front().size() - equalsPos - 1); + SymbolGroup *symGroup = nullptr; + if (evaluateExpression) { + WatchesSymbolGroup *watchesSymGroup + = ExtensionContext::instance().watchesSymbolGroup(exc.symbols(), &errorMessage); + std::string tempAssignIname = "watch.tmpassign"; + if (watchesSymGroup) { + if (watchesSymGroup->addWatch(exc.symbols(), + tempAssignIname, + stringFromHex(iname), + &errorMessage)) { + iname = tempAssignIname; + symGroup = watchesSymGroup; + } + } + } else { + // get the symbolgroup + int currentFrame = ExtensionContext::instance().symbolGroupFrame(); + if (currentFrame < 0) { + CIDebugControl *control = ExtensionCommandContext::instance()->control(); + DEBUG_STACK_FRAME frame; + if (FAILED(control->GetStackTrace(0, 0, 0, &frame, 1, NULL))) + errorMessage = "No current frame."; + else + currentFrame = frame.FrameNumber; + } + if (currentFrame >= 0) { + symGroup = ExtensionContext::instance().symbolGroup(exc.symbols(), + exc.threadId(), + currentFrame, + &errorMessage); } - currentFrame = frame.FrameNumber; } - SymbolGroup *symGroup = ExtensionContext::instance().symbolGroup(exc.symbols(), exc.threadId(), currentFrame, &errorMessage); - if (!symGroup) - break; - success = symGroup->assign(iname, encoded ? stringFromHex(value) : value, - SymbolGroupValueContext(exc.dataSpaces(), exc.symbols()), - &errorMessage); - } while (false); + if (symGroup + && symGroup->assign(iname, + encoded ? stringFromHex(value) : value, + SymbolGroupValueContext(exc.dataSpaces(), exc.symbols()), + &errorMessage)) { + ExtensionContext::instance().report('R', token, 0, "assign", "Ok"); + return S_OK; + } + } - if (success) - ExtensionContext::instance().report('R', token, 0, "assign", "Ok"); - else - ExtensionContext::instance().report('N', token, 0, "assign", errorMessage.c_str()); + ExtensionContext::instance().report('N', token, 0, "assign", errorMessage.c_str()); return S_OK; } diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index 757110161ba..a98ee3e9a7e 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -929,8 +929,15 @@ void CdbEngine::assignValueInDebugger(WatchItem *w, const QString &expr, const Q qWarning("Internal error: assignValueInDebugger: Invalid state or no stack frame."); return; } - runCommand({m_extensionCommandPrefix + "assign -h " + w->iname + '=' + toHex(value.toString()), - NoFlags}); + if (m_pythonVersion > 0x030000 && w->isWatcher()) { + runCommand({m_extensionCommandPrefix + "assign -h -e " + toHex(w->expression()) + '=' + + toHex(value.toString()), + NoFlags}); + } else { + runCommand({m_extensionCommandPrefix + "assign -h " + w->iname + '=' + toHex(value.toString()), + NoFlags}); + } + // Update all locals in case we change a union or something pointed to // that affects other variables, too. updateLocals(); From 14b86100b52990570308f0ec3f7c727801d4ab85 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 16 Apr 2020 18:19:11 +0200 Subject: [PATCH 37/41] QmlDesigner: Add action for setting initial FlowItem Change-Id: I23170f08b45a9560c3d6cae6f6d56396de9aab8b Reviewed-by: Thomas Hartmann --- .../componentcore/componentcore_constants.h | 2 ++ .../componentcore/designeractionmanager.cpp | 11 +++++++++++ .../componentcore/modelnodeoperations.cpp | 19 ++++++++++++++++++- .../componentcore/modelnodeoperations.h | 1 + 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h b/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h index 2965bcd90b3..f2f0885fabd 100644 --- a/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h +++ b/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h @@ -57,6 +57,7 @@ const char anchorsFillCommandId[] = "AnchorsFill"; const char anchorsResetCommandId[] = "AnchorsReset"; const char removePositionerCommandId[] = "RemovePositioner"; const char createFlowActionAreaCommandId[] = "CreateFlowActionArea"; +const char setFlowStartCommandId[] = "SetFlowStart"; const char layoutRowPositionerCommandId[] = "LayoutRowPositioner"; const char layoutColumnPositionerCommandId[] = "LayoutColumnPositioner"; const char layoutGridPositionerCommandId[] = "LayoutGridPositioner"; @@ -124,6 +125,7 @@ const char layoutGridPositionerDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerCon const char layoutFlowPositionerDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Position in Flow"); const char removePositionerDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Remove Positioner"); const char createFlowActionAreaDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Create Flow Action"); +const char setFlowStartDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Set Flow Start"); const char removeLayoutDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Remove Layout"); const char addItemToStackedContainerDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Add Item"); diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp index 42f95952db1..9b07ebff385 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp @@ -874,6 +874,17 @@ void DesignerActionManager::createDefaultDesignerActions() &isFlowItem, &flowOptionVisible)); + addDesignerAction(new ModelNodeContextMenuAction( + setFlowStartCommandId, + setFlowStartDisplayName, + {}, + flowCategory, + priorityFirst, + {}, + &setFlowStartItem, + &isFlowItem, + &flowOptionVisible)); + addDesignerAction(new FlowActionConnectAction( flowConnectionCategoryDisplayName, flowConnectionCategory, diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index 43efe42069b..48a409a2a90 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp @@ -1100,7 +1100,24 @@ void addFlowEffect(const SelectionContext &selectionContext, const TypeName &typ container.nodeProperty("effect").reparentHere(effectNode); view->setSelectedModelNode(effectNode); } - }); + }); +} + +void setFlowStartItem(const SelectionContext &selectionContext) +{ + AbstractView *view = selectionContext.view(); + + QTC_ASSERT(view && selectionContext.hasSingleSelectedModelNode(), return); + ModelNode node = selectionContext.currentSingleSelectedNode(); + QTC_ASSERT(node.isValid(), return); + QTC_ASSERT(node.metaInfo().isValid(), return); + QmlFlowItemNode flowItem(node); + QTC_ASSERT(flowItem.isValid(), return); + QTC_ASSERT(flowItem.flowView().isValid(), return); + view->executeInTransaction("DesignerActionManager:setFlowStartItem", + [&flowItem](){ + flowItem.flowView().setStartFlowItem(flowItem); + }); } } // namespace Mode diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.h b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.h index 994110297e0..57fd0ea12ac 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.h +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.h @@ -77,6 +77,7 @@ bool addFontToProject(const QStringList &fileNames, const QString &directory); void createFlowActionArea(const SelectionContext &selectionContext); void addTransition(const SelectionContext &selectionState); void addFlowEffect(const SelectionContext &selectionState, const TypeName &typeName); +void setFlowStartItem(const SelectionContext &selectionContext); } // namespace ModelNodeOperationso } //QmlDesigner From 49cfa2d05029777ebc32dad6375fc2000e631a47 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 15 Apr 2020 19:25:06 +0200 Subject: [PATCH 38/41] QmlDesigner: Move flow effects to submenu Change-Id: I2afdcc5068501b7b29543228668b543b0b68a4d1 Reviewed-by: Thomas Hartmann --- .../componentcore/componentcore_constants.h | 2 ++ .../componentcore/designeractionmanager.cpp | 27 ++++++++++++++----- .../modelnodecontextmenu_helper.h | 8 +++++- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h b/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h index f2f0885fabd..c0f7af85c26 100644 --- a/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h +++ b/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h @@ -41,6 +41,7 @@ const char anchorsCategory[] = "Anchors"; const char positionCategory[] = "Position"; const char layoutCategory[] = "Layout"; const char flowCategory[] = "Flow"; +const char flowEffectCategory[] = "FlowEffect"; const char flowConnectionCategory[] = "FlowConnection"; const char stackedContainerCategory[] = "StackedContainer"; const char genericToolBarCategory[] = "GenericToolBar"; @@ -86,6 +87,7 @@ const char anchorsCategoryDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextM const char positionCategoryDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Position"); const char layoutCategoryDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Layout"); const char flowCategoryDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Flow"); +const char flowEffectCategoryDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Flow Effects"); const char stackedContainerCategoryDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Stacked Container"); const char cutSelectionDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Cut"); diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp index 9b07ebff385..cf3fb5e1524 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp @@ -346,6 +346,12 @@ bool isFlowItem(const SelectionContext &context) && QmlFlowItemNode::isValidQmlFlowItemNode(context.currentSingleSelectedNode()); } +bool isFlowTarget(const SelectionContext &context) +{ + return context.singleNodeIsSelected() + && QmlFlowTargetNode::isFlowEditorTarget(context.currentSingleSelectedNode()); +} + bool isFlowTransitionItem(const SelectionContext &context) { return context.singleNodeIsSelected() @@ -362,9 +368,9 @@ bool isFlowActionItemItem(const SelectionContext &context) || QmlVisualNode::isFlowWildcard(selectedNode)); } -bool isFlowItemOrTransition(const SelectionContext &context) +bool isFlowTargetOrTransition(const SelectionContext &context) { - return isFlowItem(context) || isFlowTransitionItem(context); + return isFlowTarget(context) || isFlowTransitionItem(context); } class FlowActionConnectAction : public ActionGroup @@ -853,15 +859,24 @@ void DesignerActionManager::createDefaultDesignerActions() priorityLayoutCategory, &layoutOptionVisible)); - //isFlowTransitionItem - addDesignerAction(new ActionGroup( flowCategoryDisplayName, flowCategory, priorityFlowCategory, - &isFlowItemOrTransition, + &isFlowTargetOrTransition, &flowOptionVisible)); + + auto effectMenu = new ActionGroup( + flowEffectCategoryDisplayName, + flowEffectCategory, + priorityFlowCategory, + &isFlowTransitionItem, + &flowOptionVisible); + + effectMenu->setCategory(flowCategory); + addDesignerAction(effectMenu); + addDesignerAction(new ModelNodeFormEditorAction( createFlowActionAreaCommandId, createFlowActionAreaDisplayName, @@ -1186,7 +1201,7 @@ void DesignerActionManager::addTransitionEffectAction(const TypeName &typeName) QByteArray(ComponentCoreConstants::flowAssignEffectCommandId) + typeName, QLatin1String(ComponentCoreConstants::flowAssignEffectDisplayName) + typeName, {}, - ComponentCoreConstants::flowCategory, + ComponentCoreConstants::flowEffectCategory, {}, typeName == "None" ? 100 : 140, [typeName](const SelectionContext &context) diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h index 67a53ef9972..59029400e5a 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h +++ b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h @@ -132,16 +132,22 @@ public: bool isVisible(const SelectionContext &m_selectionState) const override { return m_visibility(m_selectionState); } bool isEnabled(const SelectionContext &m_selectionState) const override { return m_enabled(m_selectionState); } - QByteArray category() const override { return QByteArray(); } + QByteArray category() const override { return m_category; } QByteArray menuId() const override { return m_menuId; } int priority() const override { return m_priority; } Type type() const override { return ContextMenu; } + void setCategory(const QByteArray &catageoryId) + { + m_category = catageoryId; + } + private: const QByteArray m_menuId; const int m_priority; SelectionContextPredicate m_enabled; SelectionContextPredicate m_visibility; + QByteArray m_category; }; class SeperatorDesignerAction : public AbstractAction From 8c50ceb294dbdfd7a50e81d3d7d6277b414c16b7 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 16 Apr 2020 18:17:28 +0200 Subject: [PATCH 39/41] QmlDesigner: Add setStartFlowItem Change-Id: I6ad377bcca4e1db84a802909c1b5d8b9ccfe5a14 Reviewed-by: Tim Jenssen --- .../designercore/include/qmlitemnode.h | 5 ++ .../designercore/model/qmlitemnode.cpp | 56 +++++++++++++++---- 2 files changed, 49 insertions(+), 12 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h index ef8f1b28ba2..d779cc15bf3 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h +++ b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h @@ -182,8 +182,13 @@ public: const QList wildcards() const; const QList decicions() const; QList transitionsForTarget(const ModelNode &modelNode); + QList transitionsForSource(const ModelNode &modelNode); void removeDanglingTransitions(); void removeAllTransitions(); + void setStartFlowItem(const QmlFlowItemNode &flowItem); + ModelNode createTransition(); +protected: + QList transitionsForProperty(const PropertyName &propertyName, const ModelNode &modelNode); }; diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp index 098f8317a5d..e2f0602cc24 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp @@ -664,9 +664,7 @@ QList QmlFlowViewNode::flowItems() const ModelNode QmlFlowViewNode::addTransition(const QmlFlowTargetNode &from, const QmlFlowTargetNode &to) { - ModelNode transition = view()->createModelNode("FlowView.FlowTransition", 1, 0); - - nodeListProperty("flowTransitions").reparentHere(transition); + ModelNode transition = createTransition(); QmlFlowTargetNode f = from; QmlFlowTargetNode t = to; @@ -684,8 +682,6 @@ const QList QmlFlowViewNode::transitions() const return modelNode().nodeListProperty("flowTransitions").toModelNodeList(); return {}; - - } const QList QmlFlowViewNode::wildcards() const @@ -706,13 +702,12 @@ const QList QmlFlowViewNode::decicions() const QList QmlFlowViewNode::transitionsForTarget(const ModelNode &modelNode) { - QList list; - for (const ModelNode &transition : transitions()) { - if (transition.hasBindingProperty("to") - && transition.bindingProperty("to").resolveToModelNode() == modelNode) - list.append(transition); - } - return list; + return transitionsForProperty("to", modelNode); +} + +QList QmlFlowViewNode::transitionsForSource(const ModelNode &modelNode) +{ + return transitionsForProperty("from", modelNode); } void QmlFlowViewNode::removeDanglingTransitions() @@ -830,4 +825,41 @@ void QmlFlowViewNode::removeAllTransitions() removeProperty("flowTransitions"); } +void QmlFlowViewNode::setStartFlowItem(const QmlFlowItemNode &flowItem) +{ + QTC_ASSERT(flowItem.isValid(), return); + QmlFlowItemNode item = flowItem; + + ModelNode transition; + + for (const ModelNode &node : transitionsForSource(modelNode())) + transition = node; + if (!transition.isValid()) + transition = createTransition(); + + transition.bindingProperty("from").setExpression(modelNode().validId()); + transition.bindingProperty("to").setExpression(item.validId()); +} + +ModelNode QmlFlowViewNode::createTransition() +{ + ModelNode transition = view()->createModelNode("FlowView.FlowTransition", 1, 0); + nodeListProperty("flowTransitions").reparentHere(transition); + + return transition; +} + +QList QmlFlowViewNode::transitionsForProperty(const PropertyName &propertyName, + const ModelNode &modelNode) +{ + QList list; + for (const ModelNode &transition : transitions()) { + if (transition.hasBindingProperty(propertyName) + && transition.bindingProperty(propertyName).resolveToModelNode() == modelNode) + list.append(transition); + } + return list; + +} + } //QmlDesigner From 88e07d8a7a5bb38207060652e013d50f02629e5c Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 14 Apr 2020 18:26:04 +0200 Subject: [PATCH 40/41] QmlDesigner: Implement transition tool Implementing a custom tool to create transitions in flows. Change-Id: I721895c67084707bea8504c657ec9af2b5df2c22 Reviewed-by: Tim Jenssen --- src/plugins/qmldesigner/CMakeLists.txt | 1 + .../components/formeditor/formeditor.pri | 6 +- .../components/formeditor/transitiontool.cpp | 438 ++++++++++++++++++ .../components/formeditor/transitiontool.h | 98 ++++ src/plugins/qmldesigner/qmldesignerplugin.cpp | 2 + src/plugins/qmldesigner/qmldesignerplugin.qbs | 2 + 6 files changed, 545 insertions(+), 2 deletions(-) create mode 100644 src/plugins/qmldesigner/components/formeditor/transitiontool.cpp create mode 100644 src/plugins/qmldesigner/components/formeditor/transitiontool.h diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index 42feb7c13f7..f6ac4817141 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -243,6 +243,7 @@ extend_qtc_plugin(QmlDesigner snapper.cpp snapper.h snappinglinecreator.cpp snappinglinecreator.h toolbox.cpp toolbox.h + transitiontool.cpp transitiontool.h ) extend_qtc_plugin(QmlDesigner diff --git a/src/plugins/qmldesigner/components/formeditor/formeditor.pri b/src/plugins/qmldesigner/components/formeditor/formeditor.pri index 3464ba3afe4..4609b277f90 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditor.pri +++ b/src/plugins/qmldesigner/components/formeditor/formeditor.pri @@ -36,7 +36,8 @@ SOURCES += formeditoritem.cpp \ contentnoteditableindicator.cpp \ backgroundaction.cpp \ formeditortoolbutton.cpp \ - formeditorannotationicon.cpp + formeditorannotationicon.cpp \ + transitiontool.cpp HEADERS += formeditorscene.h \ formeditorwidget.h \ @@ -75,6 +76,7 @@ HEADERS += formeditorscene.h \ contentnoteditableindicator.h \ backgroundaction.h \ formeditortoolbutton.h \ - formeditorannotationicon.h + formeditorannotationicon.h \ + transitiontool.h RESOURCES += formeditor.qrc diff --git a/src/plugins/qmldesigner/components/formeditor/transitiontool.cpp b/src/plugins/qmldesigner/components/formeditor/transitiontool.cpp new file mode 100644 index 00000000000..b1cee8c443b --- /dev/null +++ b/src/plugins/qmldesigner/components/formeditor/transitiontool.cpp @@ -0,0 +1,438 @@ +/**************************************************************************** +** +** Copyright (C) 2020 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. +** +****************************************************************************/ + +#include "transitiontool.h" + +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include + +namespace QmlDesigner { + +static bool isTransitionSource(const ModelNode &node) +{ + return QmlFlowTargetNode::isFlowEditorTarget(node); +} + +static bool isTransitionTarget(const QmlItemNode &node) +{ + return QmlFlowTargetNode::isFlowEditorTarget(node) + && !node.isFlowActionArea() + && !node.isFlowWildcard(); +} + +class TransitionToolAction : public AbstractAction +{ +public: + TransitionToolAction(const QString &name) : AbstractAction(name) {} + + QByteArray category() const override + { + return QByteArray(); + } + + QByteArray menuId() const override + { + return "TransitionTool"; + } + + int priority() const override + { + return CustomActionsPriority; + } + + Type type() const override + { + return ContextMenuAction; + } + +protected: + bool isVisible(const SelectionContext &selectionContext) const override + { + if (selectionContext.scenePosition().isNull()) + return false; + + if (selectionContext.singleNodeIsSelected()) + return isTransitionSource(selectionContext.currentSingleSelectedNode()); + + return false; + } + + bool isEnabled(const SelectionContext &selectionContext) const override + { + return isVisible(selectionContext); + } +}; + +class TransitionCustomAction : public TransitionToolAction +{ +public: + TransitionCustomAction(const QString &name) : TransitionToolAction(name) {} + + QByteArray category() const override + { + return ComponentCoreConstants::flowCategory; + } + + SelectionContext selectionContext() const + { + return AbstractAction::selectionContext(); + } + +}; + +static QRectF paintedBoundingRect(FormEditorItem *item) +{ + QRectF boundingRect = item->qmlItemNode().instanceBoundingRect(); + if (boundingRect.width() < 4) + boundingRect = item->boundingRect(); + return boundingRect; +} + +static QPointF centerPoint(FormEditorItem *item) +{ + QRectF boundingRect = paintedBoundingRect(item); + return QPointF(item->scenePos().x() + boundingRect.width() / 2, + item->scenePos().y() + boundingRect.height() / 2); +} + +void static setToBoundingRect(QGraphicsRectItem *rect, FormEditorItem *item) +{ + QPolygonF boundingRectInSceneSpace(item->mapToScene(paintedBoundingRect(item))); + rect->setRect(boundingRectInSceneSpace.boundingRect()); +} + +TransitionTool::TransitionTool() + : QObject(), AbstractCustomTool() +{ + + TransitionToolAction *transitionToolAction = new TransitionToolAction(tr("Add Transition")); + QmlDesignerPlugin::instance()->designerActionManager().addDesignerAction(transitionToolAction); + + connect(transitionToolAction->action(), &QAction::triggered, + this, &TransitionTool::activateTool); + + TransitionCustomAction *removeAction = new TransitionCustomAction(tr("Remove Transitions")); + QmlDesignerPlugin::instance()->designerActionManager().addDesignerAction(removeAction); + + connect(removeAction->action(), &QAction::triggered, + this, [removeAction](){ + + SelectionContext context = removeAction->selectionContext(); + QmlFlowTargetNode node = QmlFlowTargetNode(context.currentSingleSelectedNode()); + + context.view()->executeInTransaction("Remove Transitions", [&node](){ + if (node.isValid()) + node.removeTransitions(); + }); + }); + + TransitionCustomAction *removeAllTransitionsAction = new TransitionCustomAction(tr("Remove All Transitions")); + QmlDesignerPlugin::instance()->designerActionManager().addDesignerAction(removeAllTransitionsAction); + + connect(removeAllTransitionsAction->action(), &QAction::triggered, + this, [removeAllTransitionsAction](){ + + if (QMessageBox::question(Core::ICore::dialogParent(), + tr("Remove All Transitions"), + tr("Do you really want to remove all transitions?"), + QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) + return; + + SelectionContext context = removeAllTransitionsAction->selectionContext(); + QmlFlowTargetNode node = QmlFlowTargetNode(context.currentSingleSelectedNode()); + + context.view()->executeInTransaction("Remove All Transitions", [&node](){ + if (node.isValid() && node.flowView().isValid()) + node.flowView().removeAllTransitions(); + }); + }); + + TransitionCustomAction *removeDanglingTransitionAction = new TransitionCustomAction(tr("Remove Dangling Transitions")); + QmlDesignerPlugin::instance()->designerActionManager().addDesignerAction(removeDanglingTransitionAction); + + connect(removeDanglingTransitionAction->action(), &QAction::triggered, + this, [removeDanglingTransitionAction](){ + + SelectionContext context = removeDanglingTransitionAction->selectionContext(); + QmlFlowTargetNode node = QmlFlowTargetNode(context.currentSingleSelectedNode()); + + context.view()->executeInTransaction("Remove Dangling Transitions", [&node](){ + if (node.isValid() && node.flowView().isValid()) + node.flowView().removeDanglingTransitions(); + }); + }); +} + +TransitionTool::~TransitionTool() +{ +} + +void TransitionTool::clear() +{ + m_lineItem.reset(nullptr); + m_rectangleItem1.reset(nullptr); + m_rectangleItem2.reset(nullptr); + + AbstractFormEditorTool::clear(); +} + +void TransitionTool::mousePressEvent(const QList &itemList, + QGraphicsSceneMouseEvent *event) +{ + if (m_block) + return; + + if (event->button() != Qt::LeftButton) + return; + + AbstractFormEditorTool::mousePressEvent(itemList, event); + TransitionTool::mouseMoveEvent(itemList, event); +} + +void TransitionTool::mouseMoveEvent(const QList & itemList, + QGraphicsSceneMouseEvent * event) +{ + if (!m_lineItem) + return; + + QTC_ASSERT(currentFormEditorItem(), return); + + const QPointF pos = centerPoint(m_formEditorItem); + lineItem()->setLine(pos.x(), + pos.y(), + event->scenePos().x(), + event->scenePos().y()); + + FormEditorItem *formEditorItem = nearestFormEditorItem(event->scenePos(), itemList); + + if (formEditorItem + && formEditorItem->qmlItemNode().isValid() + && isTransitionTarget(formEditorItem->qmlItemNode().modelNode())) { + rectangleItem2()->setVisible(true); + setToBoundingRect(rectangleItem2(), formEditorItem); + } else { + rectangleItem2()->setVisible(false); + } +} + +void TransitionTool::hoverMoveEvent(const QList & itemList, + QGraphicsSceneMouseEvent *event) +{ + mouseMoveEvent(itemList, event); +} + +void TransitionTool::keyPressEvent(QKeyEvent * /*keyEvent*/) +{ +} + +void TransitionTool::keyReleaseEvent(QKeyEvent * /*keyEvent*/) +{ + view()->changeToSelectionTool(); +} + +void TransitionTool::dragLeaveEvent(const QList &/*itemList*/, QGraphicsSceneDragDropEvent * /*event*/) +{ +} + +void TransitionTool::dragMoveEvent(const QList &/*itemList*/, QGraphicsSceneDragDropEvent * /*event*/) +{ +} + +void TransitionTool::mouseReleaseEvent(const QList &itemList, + QGraphicsSceneMouseEvent *event) +{ + if (m_block) + return; + + if (event->button() == Qt::LeftButton) { + FormEditorItem *formEditorItem = nearestFormEditorItem(event->scenePos(), itemList); + + if (formEditorItem + && QmlFlowTargetNode(formEditorItem->qmlItemNode().modelNode()).isValid()) + createTransition(m_formEditorItem, formEditorItem); + } + + view()->changeToSelectionTool(); +} + + +void TransitionTool::mouseDoubleClickEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) +{ + AbstractFormEditorTool::mouseDoubleClickEvent(itemList, event); +} + +void TransitionTool::itemsAboutToRemoved(const QList &) +{ + view()->changeCurrentToolTo(this); +} + +void TransitionTool::selectedItemsChanged(const QList &itemList) +{ + if (!itemList.isEmpty()) { + createItems(); + + m_formEditorItem = itemList.first(); + setToBoundingRect(rectangleItem1(), m_formEditorItem); + } +} + +void TransitionTool::instancesCompleted(const QList & /*itemList*/) +{ +} + +void TransitionTool::instancesParentChanged(const QList & /*itemList*/) +{ +} + +void TransitionTool::instancePropertyChange(const QList > & /*propertyList*/) +{ +} + +void TransitionTool::formEditorItemsChanged(const QList & /*itemList*/) +{ +} + +int TransitionTool::wantHandleItem(const ModelNode &modelNode) const +{ + if (isTransitionSource(modelNode)) + return 10; + + return 0; +} + +QString TransitionTool::name() const +{ + return tr("Transition Tool"); +} + +void TransitionTool::activateTool() +{ + view()->changeToCustomTool(); +} + +void TransitionTool::unblock() +{ + m_block = false; +} + +QGraphicsLineItem *TransitionTool::lineItem() +{ + return m_lineItem.get(); +} + +QGraphicsRectItem *TransitionTool::rectangleItem1() +{ + return m_rectangleItem1.get(); +} + +QGraphicsRectItem *TransitionTool::rectangleItem2() +{ + return m_rectangleItem2.get(); +} + +FormEditorItem *TransitionTool::currentFormEditorItem() const +{ + if (scene()->items().contains(m_formEditorItem)) + return m_formEditorItem; + + return nullptr; +} + +void TransitionTool::createItems() { + m_block = true; + QTimer::singleShot(200, this, [this](){ unblock(); }); + + if (!lineItem()) + m_lineItem.reset(new QGraphicsLineItem(scene()->manipulatorLayerItem())); + + if (!rectangleItem1()) + m_rectangleItem1.reset(new QGraphicsRectItem(scene()->manipulatorLayerItem())); + + if (!rectangleItem2()) + m_rectangleItem2.reset(new QGraphicsRectItem(scene()->manipulatorLayerItem())); + + m_rectangleItem2->setVisible(false); + + QPen pen; + pen.setColor(QColor(Qt::lightGray)); + pen.setStyle(Qt::DashLine); + pen.setWidth(0); + m_lineItem->setPen(pen); + + pen.setColor(QColor(108, 141, 221)); + pen.setStyle(Qt::SolidLine); + pen.setWidth(4); + pen.setCosmetic(true); + m_rectangleItem1->setPen(pen); + + m_rectangleItem2->setPen(pen); +} + +void TransitionTool::createTransition(FormEditorItem *source, FormEditorItem *target) +{ + QmlFlowTargetNode sourceNode(source->qmlItemNode().modelNode()); + QmlFlowTargetNode targetNode(target->qmlItemNode().modelNode()); + + if (sourceNode.isValid() && targetNode.isValid() + && sourceNode != targetNode + && !targetNode.isFlowActionArea() + && !targetNode.isFlowWildcard()) { + view()->executeInTransaction("create transition", [&sourceNode, targetNode](){ + sourceNode.assignTargetItem(targetNode); + }); + } else { + qWarning() << Q_FUNC_INFO << "nodes invalid"; + } +} + +} diff --git a/src/plugins/qmldesigner/components/formeditor/transitiontool.h b/src/plugins/qmldesigner/components/formeditor/transitiontool.h new file mode 100644 index 00000000000..6efa1d177a1 --- /dev/null +++ b/src/plugins/qmldesigner/components/formeditor/transitiontool.h @@ -0,0 +1,98 @@ +/**************************************************************************** +** +** Copyright (C) 2020 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. +** +****************************************************************************/ +#pragma once + +#include "abstractcustomtool.h" +#include "selectionindicator.h" + +#include +#include +#include + +#include + +namespace QmlDesigner { + +class TransitionTool : public QObject, public AbstractCustomTool +{ + Q_OBJECT +public: + TransitionTool(); + ~TransitionTool(); + + void mousePressEvent(const QList &itemList, + QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(const QList &itemList, + QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(const QList &itemList, + QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent(const QList &itemList, + QGraphicsSceneMouseEvent *event) override; + void hoverMoveEvent(const QList &itemList, + QGraphicsSceneMouseEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *keyEvent) override; + + void dragLeaveEvent(const QList &itemList, + QGraphicsSceneDragDropEvent * event) override; + void dragMoveEvent(const QList &itemList, + QGraphicsSceneDragDropEvent * event) override; + + void itemsAboutToRemoved(const QList &itemList) override; + + void selectedItemsChanged(const QList &itemList) override; + + void instancesCompleted(const QList &itemList) override; + void instancesParentChanged(const QList &itemList) override; + void instancePropertyChange(const QList > &propertyList) override; + + void clear() override; + + void formEditorItemsChanged(const QList &itemList) override; + + int wantHandleItem(const ModelNode &modelNode) const override; + + QString name() const override; + + void activateTool(); + void unblock(); + + QGraphicsLineItem *lineItem(); + QGraphicsRectItem *rectangleItem1(); + QGraphicsRectItem *rectangleItem2(); + +private: + FormEditorItem *currentFormEditorItem() const; + void createItems(); + void createTransition(FormEditorItem *item1, FormEditorItem *item2); + + FormEditorItem* m_formEditorItem; + std::unique_ptr m_lineItem; + std::unique_ptr m_rectangleItem1; + std::unique_ptr m_rectangleItem2; + bool m_block = true; +}; + +} //QmlDesigner diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index a65ff3600be..5fd0b7990db 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -242,6 +243,7 @@ bool QmlDesignerPlugin::delayedInitialize() d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::AnnotationTool); d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::TextTool); d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::PathTool); + d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::TransitionTool); return true; } diff --git a/src/plugins/qmldesigner/qmldesignerplugin.qbs b/src/plugins/qmldesigner/qmldesignerplugin.qbs index 3c434788cd9..c69f5e5c227 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.qbs +++ b/src/plugins/qmldesigner/qmldesignerplugin.qbs @@ -530,6 +530,8 @@ Project { "formeditor/toolbox.h", "formeditor/formeditortoolbutton.cpp", "formeditor/formeditortoolbutton.h", + "formeditor/transitiontool.cpp", + "formeditor/transitiontool.h", "importmanager/importlabel.cpp", "importmanager/importlabel.h", "importmanager/importmanagercombobox.cpp", From 02226300120a2c3c3795159736ed0b84d46fbb44 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Mon, 6 Apr 2020 15:50:54 +0200 Subject: [PATCH 41/41] QmlDesigner: Add fontStyle support Task-number: QDS-1884 Change-Id: Ifb3ec8cf92668adb2e4e5f01e0e0b2403eb4cbac Reviewed-by: Thomas Hartmann --- .../imports/HelperWidgets/FontSection.qml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml index a97923a032c..4ef079af4c7 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml @@ -68,9 +68,12 @@ Section { text: qsTr("Font") } FontComboBox { + id: fontComboBox backendValue: fontSection.fontFamily Layout.fillWidth: true width: 160 + property string familyName: backendValue.value + onFamilyNameChanged: print(styleNamesForFamily(familyName)) } Label { @@ -151,6 +154,7 @@ Section { italic: fontSection.italicStyle underline: fontSection.underlineStyle strikeout: fontSection.strikeoutStyle + enabled: !styleComboBox.styleSet } Label { @@ -175,6 +179,21 @@ Section { backendValue: getBackendValue("weight") model: ["Normal", "Light", "ExtraLight", "Thin", "Medium", "DemiBold", "Bold", "ExtraBold", "Black"] scope: "Font" + enabled: !styleComboBox.styleSet + } + + Label { + text: qsTr("Style name") + toolTip: qsTr("Sets the font's style.") + } + + ComboBox { + id: styleComboBox + property bool styleSet: backendValue.isInModel + Layout.fillWidth: true + backendValue: getBackendValue("styleName") + model: styleNamesForFamily(fontComboBox.familyName) + useString: true } Label {