aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner.MetaInfo: Add font to value typesThomas Hartmann2019-06-281-2/+2
| | | | | Change-Id: I4851e8d86634f1653bb898be7c2f0a7d6691b2d3 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add simplifiedTypeName to NodeMetaInfoThomas Hartmann2019-06-031-0/+5
| | | | | Change-Id: I07fe0b4d6b88a280cd0696ef0bcafa774b866edb Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix issue with list propertiesv4.9.1Thomas Hartmann2019-05-251-0/+6
| | | | | | | | | On pure QML types list properties were reported as list properties. Task-number: QDS-687 Change-Id: I34b1688953185b65d64c299c72c8170d7daa789b Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix metainfoThomas Hartmann2019-03-221-1/+1
| | | | | | | | | | | We have to check the propertyToken, because the default token is most likely invalid. e.g.: [default] property alias: something Change-Id: Ieedb1f3907c78d52f4e4406e2a2bf4d93bf1f636 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add support for DialogThomas Hartmann2019-03-201-0/+1
| | | | | | Change-Id: I8a2972f80ae79835018870eda7b11a817353bf94 Task-numbner: QTCREATORBUG-22120 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Merge remote-tracking branch 'origin/4.8'Eike Ziller2019-01-311-1/+1
|\ | | | | | | Change-Id: Ia8fed69168d87afafdb5acf4de4d5d30f9b4ebf5
| * QmlDesigner: Add some extra info to warnings and assertsThomas Hartmann2019-01-211-1/+1
| | | | | | | | | | Change-Id: Ib9c924f7a619b5e79480b5a99291cb9969e7f629 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | qmljs: update parserMarco Benelli2018-11-221-2/+2
|/ | | | | | | | | Update the qtcreator qmljs parser to the one of Qt 5.12. It supports EcmaScript 7. Task-number: QTCREATORBUG-20341 Change-Id: I0d1cff71402ba17e22cde6b46c65614e162280de Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* QmlDesigner: Fix clazy warningsThomas Hartmann2018-08-011-4/+4
| | | | | | | Use const & Change-Id: Iaa540194e45871500dc80a55cd2cb6beeeee45b5 Reviewed-by: hjk <hjk@qt.io>
* QmlDesigner: ModernizeAlessandro Portale2018-07-251-15/+10
| | | | | | | | | | | | modernize-use-auto modernize-use-nullptr modernize-use-override modernize-use-using modernize-use-default-member-init modernize-use-equals-default Change-Id: Ic42b5c59fed5a4a01853138542d8156471e86f58 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Fix: member initializer for 'm_fooBar' is redundantAlessandro Portale2018-07-121-6/+1
| | | | | | | | warning: member initializer for 'm_isValid' is redundant [modernize-use-default-member-init] Change-Id: Icd521e7d77054512bc0ed6b95cf08440320b0ce0 Reviewed-by: hjk <hjk@qt.io>
* qmldesigner: avoid reloading document when not neededMarco Benelli2018-04-051-10/+14
| | | | | | | | | Creating a new ReadingContext is an expensive operation as it creates and call a Link object. This operation is needed only when the document is actually changed, in all the other cases it is not needed. Change-Id: Ia368122d60d2c7de86d10e169dd7f20a19f01115 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Avoid detachsThomas Hartmann2018-01-231-14/+14
| | | | | | | | | The non const overloads of first() and last() do detach if the reference count is higher than 1. Therefore we use constFirst() and constLast() instead. Change-Id: I737cfc428f1c21f16185b9b51175e181c0ec7068 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* fix property spellingTim Jenssen2017-07-171-2/+2
| | | | | Change-Id: I00f84ec8d2c83d7f3937d2e21a24e02ba28991b3 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlDesigner: use initilizer_lists for pairsTim Jenssen2017-04-281-7/+7
| | | | | Change-Id: I3a1ef67d8af255604494695807331576540b8afa Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: use initializer listsTim Jenssen2017-04-261-1/+1
| | | | | Change-Id: Ibdc46d30ad3f2b703d4cbdd796a1032030bd17cd Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: improve check class hierarchy codeTim Jenssen2017-04-251-19/+12
| | | | | | | | | | | | - improve existing superClasses() via using transform (internal it uses reserve, shorter, ...) - remove unused superClassNames() if necessary it can be done by a simple transform call - introduce and use classHierarchy() and fix foreach loop which was using wrong "modelNode" instead of "superClass" Change-Id: Ia52bcbd322f3a047a020faf4a67aca2a1b8fd19a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Merge remote-tracking branch 'origin/4.3'Eike Ziller2017-04-251-16/+17
|\ | | | | | | Change-Id: I01d7d8aa282f2bca94f85f55c832c76672e229f7
| * QmlDesigner: use default initializer where possibleTim Jenssen2017-04-241-8/+9
| | | | | | | | | | Change-Id: I9bde2421a5cc99b1c815b568fa2a4a2e722b852d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: white space only changesTim Jenssen2017-04-241-8/+8
| | | | | | | | | | | | Change-Id: I8df6b1f53fce79fdf9eed022bc189754e668589b Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlJs: sync qmljs parserMarco Benelli2017-03-231-2/+2
|/ | | | | | | | | | The last version of the grammar contains some constructs that the code model needs to know. Task-number: QTCREATORBUG-17842 Change-Id: I6250f96431acc05b19f3fd1b6cc268a07485cf0f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Quick fix for PopupThomas Hartmann2017-02-221-1/+3
| | | | | | | | | This is a quickfix for Controls 2 Popup, Drawer, Menu and Dialog. We pretend everything derived from QtQuick.Controls.Popup is an item instead of a QQObject. Change-Id: I603dce8a1a1b08df3e2c1dccc0fa57e7ccef0800 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner.MetaInfo: Resolve properties using the CppComponentValueThomas Hartmann2016-07-121-0/+4
| | | | | | | | If the type is still "unknown" use the CppComponentValue to resolve the type. Change-Id: Ib404faa89a06d93f34189abfc7427122567ff25a Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* QmlDesigner.MetaInfo: fix lazy initializationThomas Hartmann2016-07-121-0/+2
| | | | | | | The lazy initialization was missing for NodeMetaInfoPrivate::propertyType() Change-Id: Ic2251df30de2187aea44fe7a48df9e5e0d635ab8 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* QmlDesigner.MetaInfo: Initiliase property info lazilyThomas Hartmann2016-06-291-6/+47
| | | | | | | | | There exists cases where collecting the properties is very slow. We only have to do this on demand for the property editor. Change-Id: I92d7270481db94655c95ab8d69f373488d841b4e Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* QmlDesigner: use initializer listsTim Jenssen2016-06-221-4/+4
| | | | | Change-Id: Ie93861c7d8a5b2863ec8b111afceacc2c163715b Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* QmlDesigner: use QVector as container for PropertyInfoTim Jenssen2016-06-081-17/+17
| | | | | | | | - This seems to be faster, but difficult to measure, was only 1% of the starting time and tested with 100 starts Change-Id: I0273dcd923a4c1e47510e64c0349acda93b0e286 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* QmlDesigner: small speed improvementsTim Jenssen2016-06-081-41/+34
| | | | | Change-Id: I8fb3f36426043ed4502ba4a8d18c677ad85a1842 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* Merge remote-tracking branch 'origin/4.0'Eike Ziller2016-04-121-9/+9
|\ | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f
| * QmlDesigner: use default values at isSubclassOfTim Jenssen2016-04-061-9/+9
| | | | | | | | | | Change-Id: Ia31d698635a9b29a023f4d919f3741ac912923b7 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* | QmlDesigner: build fixTim Jenssen2016-04-011-1/+1
| | | | | | | | | | Change-Id: I9b911b1650cc5a57f7b385f78e77eb5d38b1b3e7 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* | QmlDesigner: Fix compile for Qt5.5 on OSXTim Jenssen2016-04-011-1/+1
| | | | | | | | | | | | Change-Id: Iaa2540e2704373d5807e8927109f5a14658bf619 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com> Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* | QmlDesigner: Qt 5.5 Linux build fixTim Jenssen2016-03-241-1/+1
| | | | | | | | | | Change-Id: I50bc07df07010eda4c4e3fdc49798eb73fe9650f Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* | Keep QT_RESTRICTED_CAST_FROM_ASCII in the designerTim Jenssen2016-03-231-77/+78
|/ | | | | | | There is no reason to undefine QT_RESTRICTED_CAST_FROM_ASCII (anymore). Change-Id: Iabeacc8a89d662e78986e2dc275c2096a9c9e519 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* QmlDesigner: Do not collect the prototypes manuallyThomas Hartmann2016-02-221-6/+5
| | | | | | | The PrototypeIterator can handle cycles etc... Change-Id: Ied47bc6acbab32d782f6827cf849711aed660822 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-10/+10
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* QmlDesigner: Ensure that QQuickItem is always used from the QtQuick exportThomas Hartmann2016-01-081-0/+15
| | | | | | | | | The code model creates multiple exports for QQuickItem, but to be able to identify it as QtQuick.Item we have to always use the QtQuick export. Change-Id: Ife567cfb368092f818c7cf418ede4ab1bca227fa Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com> Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Don't put QString in static attributesAleix Pol2015-10-091-1/+1
| | | | | | | | | | It crashed in some places on our code-base due to the so-called "static initialization order fiasco". As a solution, it turns the variable into a function. This shouldn't have a penalty due to QStringLiteral. Change-Id: I9f8a955afdff878dc2f0db16fec861d81250c243 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Qt Quick Designer: License change to Qt Commercial + GPLv3Alessandro Portale2015-09-181-12/+7
| | | | | | | | Change-Id: I7f7aecd02892b6c616cd148fa5d845e7bc0d3b4f Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* QmlDesigner: Fix warnings about inconsistent override usageTobias Hunger2015-08-271-1/+1
| | | | | Change-Id: I71de3d105c97940fe3b72adfbe3dbb898d7a7d2e Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.5'Eike Ziller2015-08-041-0/+5
|\ | | | | | | Change-Id: I7b3ef276d438ff0f184a649153e8aeec08a9f8c9
| * QmlDesigner: take version into account when looking up specificsThomas Hartmann2015-07-201-0/+5
| | | | | | | | | | Change-Id: I074a2930b5d0cfee6444ee4df6f032e06a8ecc55 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* | QmlDesigner: Use utf8 instead of Latin1Thomas Hartmann2015-07-221-1/+1
| | | | | | | | | | | | | | | | | | QML files are utf8 encoded, therefore we have to use utf8 consistently. There is no gurantee that identifiers and names are just latin1. Change-Id: I4aa58d4c68c126d74badfc699a239ef9b2790faa Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* | QmlDesigner: Adding overrideThomas Hartmann2015-07-141-1/+1
|/ | | | | Change-Id: I4c0443a212de2b82087295405317d6bce1c0f3eb Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Clean headers in lib qmljs and plugins qmljstools, qmljseditor.Friedemann Kleint2015-03-051-0/+1
| | | | | Change-Id: I3256db8f4d42b6326d986d754b45e6c6c2030839 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* QmlDesigner: Fix clang warningThomas Hartmann2015-02-191-1/+1
| | | | | Change-Id: Ie783b8e32697a286cabbf25b06d06578d62a7340 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* QmlDesigner: Remove unneeded qualificationsOrgad Shaneh2015-02-181-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly done using the following ruby script: Dir.glob('**/*.cpp').each { |file| next if file =~ %r{src/shared/qbs|/qmljs/} s = File.read(file) s.scan(/^using namespace (.*);$/) { ns = $1 t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m| before = $1 char = $2 if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/ m else before + char end } if t != s puts file File.open(file, 'w').write(t) end } } Change-Id: I492792bb9e5655c55795e938031efc557c9a462f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-141-7/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/ipaddresslineedit.cpp src/libs/utils/logging.h src/plugins/analyzerbase/AnalyzerBase.pluginspec.in src/plugins/android/Android.pluginspec.in src/plugins/android/androiddeploystep.cpp src/plugins/android/androiddeploystep.h src/plugins/android/androiddeploystepfactory.cpp src/plugins/android/androiddeploystepwidget.cpp src/plugins/android/androidpackagecreationfactory.cpp src/plugins/android/androidpackagecreationstep.cpp src/plugins/android/androidpackagecreationstep.h src/plugins/android/androidpackagecreationwidget.cpp src/plugins/android/androidpackagecreationwidget.h src/plugins/android/javafilewizard.cpp src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/baremetal/BareMetal.pluginspec.in src/plugins/bazaar/Bazaar.pluginspec.in src/plugins/beautifier/Beautifier.pluginspec.in src/plugins/bineditor/BinEditor.pluginspec.in src/plugins/bookmarks/Bookmarks.pluginspec.in src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in src/plugins/clangcodemodel/clanghighlightingsupport.cpp src/plugins/clangcodemodel/clangsymbolsearcher.cpp src/plugins/classview/ClassView.pluginspec.in src/plugins/clearcase/ClearCase.pluginspec.in src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp src/plugins/cmakeprojectmanager/cmakehighlighter.cpp src/plugins/coreplugin/Core.pluginspec.in src/plugins/cpaster/CodePaster.pluginspec.in src/plugins/cppeditor/CppEditor.pluginspec.in src/plugins/cppeditor/cppfilewizard.cpp src/plugins/cpptools/CppTools.pluginspec.in src/plugins/cpptools/cpphighlightingsupportinternal.cpp src/plugins/cpptools/cppmodelmanagerinterface.cpp src/plugins/cpptools/cppmodelmanagerinterface.h src/plugins/cvs/CVS.pluginspec.in src/plugins/debugger/Debugger.pluginspec.in src/plugins/designer/Designer.pluginspec.in src/plugins/diffeditor/DiffEditor.pluginspec.in src/plugins/emacskeys/EmacsKeys.pluginspec.in src/plugins/fakevim/FakeVim.pluginspec.in src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in src/plugins/git/Git.pluginspec.in src/plugins/git/gitorious/gitorious.cpp src/plugins/git/gitorious/gitorious.h src/plugins/git/gitorious/gitoriousclonewizard.cpp src/plugins/git/gitorious/gitorioushostwidget.cpp src/plugins/git/gitorious/gitorioushostwidget.h src/plugins/git/gitorious/gitorioushostwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwidget.cpp src/plugins/git/gitorious/gitoriousprojectwidget.h src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwizardpage.h src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp src/plugins/git/gitorious/gitoriousrepositorywizardpage.h src/plugins/glsleditor/GLSLEditor.pluginspec.in src/plugins/glsleditor/glsleditorfactory.cpp src/plugins/glsleditor/glslfilewizard.cpp src/plugins/helloworld/HelloWorld.pluginspec.in src/plugins/help/Help.pluginspec.in src/plugins/imageviewer/ImageViewer.pluginspec.in src/plugins/ios/Ios.pluginspec.in src/plugins/macros/Macros.pluginspec.in src/plugins/mercurial/Mercurial.pluginspec.in src/plugins/perforce/Perforce.pluginspec.in src/plugins/projectexplorer/ProjectExplorer.pluginspec.in src/plugins/pythoneditor/PythonEditor.pluginspec.in src/plugins/pythoneditor/pythoneditorwidget.cpp src/plugins/pythoneditor/wizard/pythonfilewizard.cpp src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in src/plugins/qmakeprojectmanager/profileeditorfactory.cpp src/plugins/qmldesigner/QmlDesigner.pluginspec.in src/plugins/qmljseditor/QmlJSEditor.pluginspec.in src/plugins/qmljseditor/qmljseditorfactory.cpp src/plugins/qmljstools/QmlJSTools.pluginspec.in src/plugins/qmlprofiler/QmlProfiler.pluginspec.in src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in src/plugins/qnx/Qnx.pluginspec.in src/plugins/qtsupport/QtSupport.pluginspec.in src/plugins/remotelinux/RemoteLinux.pluginspec.in src/plugins/resourceeditor/ResourceEditor.pluginspec.in src/plugins/resourceeditor/resourcewizard.h src/plugins/subversion/Subversion.pluginspec.in src/plugins/tasklist/TaskList.pluginspec.in src/plugins/texteditor/TextEditor.pluginspec.in src/plugins/texteditor/basetexteditor_p.h src/plugins/texteditor/basetextmark.cpp src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h src/plugins/texteditor/codeassist/defaultassistinterface.h src/plugins/texteditor/codeassist/iassistproposalitem.cpp src/plugins/texteditor/itexteditor.cpp src/plugins/texteditor/itexteditor.h src/plugins/texteditor/itextmark.cpp src/plugins/texteditor/plaintexteditor.cpp src/plugins/texteditor/plaintexteditor.h src/plugins/texteditor/texteditoractionhandler.cpp src/plugins/todo/Todo.pluginspec.in src/plugins/updateinfo/UpdateInfo.pluginspec.in src/plugins/valgrind/Valgrind.pluginspec.in src/plugins/vcsbase/VcsBase.pluginspec.in src/plugins/welcome/Welcome.pluginspec.in src/plugins/winrt/WinRt.pluginspec.in tests/auto/debugger/temporarydir.h Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
| * License updateEike Ziller2014-10-091-7/+8
| | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>