aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
Commit message (Expand)AuthorAgeFilesLines
* qmldesigner: Avoid crash of TextToModelMerger::getQMLSingletons()Fawzi Mohamed2020-10-031-0/+3
* QmlDesigner: Rename CppTypeData to QmlTypeDataThomas Hartmann2020-07-031-0/+31
* QmlDesigner: Fix for Connections visibilityAleksei German2020-06-251-1/+1
* QmlDesigner: Fix imports from other projects being show in import listMiikka Heikkinen2020-06-111-1/+1
* Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-061-3/+3
|\
| * QmlDesigner: Fix crashThomas Hartmann2020-05-051-3/+3
* | QmlDesigner: Update properties in property editorHenning Gruendl2020-04-271-2/+7
|/
* QmlJS: Fix compileChristian Stenger2020-03-041-1/+1
* Update qmljs parser to Qt 5.15 parserFawzi Mohamed2020-03-031-7/+7
* Qml tooling: Support Qt 5.15Thomas Hartmann2020-02-191-1/+1
* QmlDesigner: Add item layer propertiesHenning Gruendl2019-12-061-1/+1
* QmlDesigner: Fix some warningsChristian Kandeler2019-10-291-5/+8
* QmlDesigner: Use fuzzy compare for floatsThomas Hartmann2019-10-251-1/+4
* QmlDesigner: Add supported Qt Quick versionThomas Hartmann2019-09-301-1/+1
* QmlDesigner: Work around yet another Qt deprecation warninghjk2019-08-261-1/+2
* More on QTime::start() deprecationhjk2019-08-191-1/+2
* QmlDesigner: reduce enumeration to header onlyTim Jenssen2019-08-071-1/+2
* QmlDesigner: Add Text to list of known Enum scopesVikas Pachdha2019-07-301-1/+2
* QtDesignStudio Color Editor updateAleksei German2019-06-051-0/+9
* Merge remote-tracking branch 'origin/4.9'Eike Ziller2019-04-021-1/+2
|\
| * Qml tooling: Support Qt 5.13 and change default to 5.12Alessandro Portale2019-03-281-1/+2
* | Move qrc parser from QmlJS to UtilsChristian Kandeler2019-02-131-2/+2
|/
* Merge remote-tracking branch 'origin/4.8'Eike Ziller2019-01-311-0/+5
|\
| * QmlDesigner: Add some extra info to warnings and assertsThomas Hartmann2019-01-211-0/+5
* | qmljs: update parserMarco Benelli2018-11-221-7/+4
|/
* Remove hard-coded disabling of debug logsOrgad Shaneh2018-10-131-1/+1
* Qml tooling: Support Qt 5.12Alessandro Portale2018-09-131-1/+1
* QmlDesigner: Fix clazy warningThomas Hartmann2018-08-021-61/+60
* QmlDesigner: ModernizeAlessandro Portale2018-07-251-38/+38
* QmlDesigner: Disable shortcut if document did not changeThomas Hartmann2018-05-151-0/+2
* QmlDesigner: Set TextToModelMerger active to false when returningThomas Hartmann2018-04-201-2/+5
* Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-04-131-2/+2
|\
| * Qml tooling: Support Qt 5.11Alessandro Portale2018-04-121-1/+1
| * QmlDesigner: Add missing enum scopeThomas Hartmann2018-04-051-1/+1
* | qmldesigner: avoid reloading document when not neededMarco Benelli2018-04-051-9/+21
* | qmljs: remove remaining references to QtQuick1Marco Benelli2018-04-031-6/+2
|/
* QmlDesigner: Define new possible enum scopesThomas Hartmann2018-03-091-1/+1
* QmlDesigner: Add features to .metainfo fileThomas Hartmann2018-01-231-8/+27
* QmlDesigner: Avoid detachsThomas Hartmann2018-01-231-9/+9
* QmlDesigner: Add global focus enumsThomas Hartmann2018-01-091-1/+2
* QmlDesigner: Ignore indentation for multi line expressionsThomas Hartmann2017-11-161-2/+16
* QmlDesigner: Add support Qt Quick 2.10Thomas Hartmann2017-09-271-1/+1
* QmlDesigner: Allow WebEngine importThomas Hartmann2017-08-311-1/+0
* QmlDesigner: Support Qt Quick 2.9Thomas Hartmann2017-07-061-1/+1
* QmlDesigner: Remove double negationsRobert Loehning2017-06-161-2/+2
* Merge remote-tracking branch 'origin/4.3' into masterOrgad Shaneh2017-05-231-2/+14
|\
| * QmlDesigner: Always add the iso icons to the qrc mappingThomas Hartmann2017-05-221-2/+14
* | QmlDesigner: use initilizer_lists for pairsTim Jenssen2017-04-281-1/+1
* | QmlDesigner: use initializer listsTim Jenssen2017-04-261-6/+6
* | QmlDesigner: fix pathes -> paths and use initializer_listsTim Jenssen2017-04-261-3/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 16:38:03 +0000