summaryrefslogtreecommitdiff
path: root/src/plugins/qmldesigner/designercore/model/internalnode.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove GPL-3.0+ from license identifiersKai Köhne2023-01-061-1/+1
| | | | | | | | | | | | | | | Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0, this applies only to a hypothetical newer version of GPL, that doesn't exist yet. If such a version emerges, we can still decide to relicense... While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only Change was done by running find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \; Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Utils: Remove Utils::optionalEike Ziller2022-09-011-1/+1
| | | | | | | | | | Since we are now requiring macOS 10.14 we can remove our local implementation of optional and use std::optional for macOS too. Change-Id: I2bd018261b68da64f7f031a812045dd7784697e1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Use SPDX license identifiersLucie Gérard2022-08-261-24/+2
| | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Add type enumeration to auxiliary dataMarco Bubke2022-08-091-11/+59
| | | | | | | | | | | | | | | | | | | | | | | Auxiliary data so far used naming conventions to declare the kind of the data. Now an enumeration is used. The auxiliaryData(...) is returning an optional too so that it is known if a value exists. There is now auxiliaryDataWithDefault(...) which is returning an invalid QVariant instead. The instance cache is now disabled because there is not notification for information changes. So if we get the real data from the node instances there will be no information changes because nothing changed. So the form editor is a strange state of being reset but not all data arrived. Before this patch there were still changes happen because of some side effects that auxiliary properties were sent which were never intended to be sent. If we re-enable the cache we need to send information changes or every view must expect that the information is already there. Task-number: QDS-7338 Change-Id: I0cafd149c53df552c7c8442f1e8ba87f5451dbd1 Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QmlDesigner: Simplify InternalNodeMarco Bubke2022-07-281-173/+12
| | | | | | | | | | | | | | Before we add new members the simple getter and setter without value are removed because the model provides capsulation. To remove the weak pointer workaround std::enable_shared_from_this is used which makes the class aware of its shared pointer. For that we change to std::shared_ptr Task-number: QDS-7343 Change-Id: Ic5f14ba8c1fd7af7633b8decb413538ee01c90d6 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Merge remote-tracking branch 'origin/8.0'Eike Ziller2022-07-251-0/+15
|\ | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp Change-Id: I1ed3dd86fe5b4b87e3015c41652f5d0fa16d7070
| * QmlDesigner: Implement support for SignalDeclarationPropertyThomas Hartmann2022-07-201-0/+15
| | | | | | | | | | | | | | | | | | | | | | This allows implementing a signal with a signature. e.g. signal mySignal(int i) Task-number: QDS-7319 Change-Id: I23cb000a218d709218322e7f31c86076d3ad949b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | Merge remote-tracking branch 'origin/8.0'Eike Ziller2022-07-201-0/+10
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/plugins/todo/optionsdialog.cpp src/plugins/todo/todoprojectsettingswidget.cpp Change-Id: I24ca90c2fc2cd707df901d42694df6d0e27d696d
| * QmlDesigner: Add support for BehavioursThomas Hartmann2022-07-131-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A Behavior will be added as a normal ModelNode to the default property, but we store the property name in behaviorPropertyName. The value of behaviorPropertyName cannot be changed after the ModelNode was created, since I do not see any use case and it keeps things simple. Change-Id: I69ba1d4d706432cfbbd35b001238f623e6e0b4fd Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | Utils: Collapse most of porting,hhjk2022-07-131-1/+1
|/ | | | | | | | | Taking the Qt 6 branches, leaving some dummies until downstream adapted. Change-Id: Ib9b86568d73c341c8f740ba497c3cbfab830d8a1 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QmlDesigner: Remove foreach / Q_FOREACH usage in designercoreArtem Sokolovskii2022-05-131-3/+6
| | | | | | | | Task-number: QTCREATORBUG-27464 Change-Id: Ib1e693df7e3690b7cf3e6dc42e1d18a05a8f46d6 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Merge remote-tracking branch 'origin/4.14'Eike Ziller2020-12-071-1/+1
|\ | | | | | | Change-Id: I9d1931b7862f4541ac7a064ff987128afd835cbe
| * Fix a warning about conversion from size_t to uintJarek Kobus2020-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | Fix a warning: conversion from ‘size_t’ {aka ‘long unsigned int’} to ‘uint’ {aka ‘unsigned int’} changes value from ‘4939931809569846361’ to ‘3557831769’ [-Woverflow] Task-number: QTCREATORBUG-24098 Change-Id: Ibc123d8e28c7072dd947a1f8058dc8561ff7f6df Reviewed-by: hjk <hjk@qt.io>
* | QmlDesigner: Improve return valuesMarco Bubke2020-11-181-1/+1
|/ | | | | | | | | | | You can return by const reference if you the ownership of the return value is non local. If it is local you should return by value. In that case it should be non const because otherwise the compile cannot move the return value. Change-Id: I2a4b08dd0e67a2c2741a46bdd7def842c1db3fbf Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: ModernizeAlessandro Portale2018-07-251-1/+1
| | | | | | | | | | | | 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>
* QmlDesigner: Implementing dynamic node propertiesThomas Hartmann2016-09-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | The model now supports dynamic node properties. e.g.: Item { property Item item: Item { } } In this case Property::dynamicpropertyType() is Item and Property::isDynamic() is true. To create such a property I added: NodeProperty::setDynamicTypeNameAndsetModelNode(). It is not supported to reparent nodes in an out of dynamic node properties. The model throws an exception in this case. This is currently not required on the application level and not supported by the rewriter. Change-Id: Ie05325663c481d8583dc45bee38b559c190fbb30 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* 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>
* 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>
* 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>
* | QmlDesigner: clean up QWeakPointer useTim Jenssen2014-09-051-4/+6
|/ | | | | Change-Id: I314519f7458d4b87e2056cca1ce35f8604f1f51f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner: Add ModelNode::hasIdMarco Bubke2014-05-071-0/+5
| | | | | Change-Id: I0f6e46c2f3ee91579e754dde434aa51a33b9c671 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesiger: Expose NodeAbstractProperty::directSubNodesMarco Bubke2014-04-241-1/+1
| | | | | Change-Id: I379f2783d4f95e2731776802cb047bfe5efea92e Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QmlDesigner: Remove AuxiliaryDataauxilary if data is invalidMarco Bubke2013-08-051-0/+5
| | | | | Change-Id: Ifc802442f54b4c84e1df04cbd8c59ad48c745aa5 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Clean headers in QML-Designer.Friedemann Kleint2013-04-301-3/+1
| | | | | | | | | Ran script to remove inludes on a trial-and-error basis and manually corrected it. Change-Id: I8a2e9e35980198fc4162623db044c228bd209a0f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner.Model: Adding SignalHandlerPropertyThomas Hartmann2013-04-021-0/+15
| | | | | | | | | | | | | | | SignalHandlerProperty allows editing convenient editing of signal handlers like onMousePress in the model. The interface is analogous to BindingProperty. Since mos views do not care about SignalHandlerProperties and they should not be mixed up with BindingProperties they are different types. I also added the signalHandlerPropertiesChanged() notifier to AbstractView. Change-Id: I68bc7d2c5d3b991944e8f8d698212a1dfef218bf Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner: Type of the propertyname is now PropertyNameThomas Hartmann2013-03-251-21/+21
| | | | | | | | | | | And PropertyName is a typedef for QByteArray. Because we don't use the features of QString and the source would be cluttered with QLatin1Strings we changed the property name to QByteArray. Change-Id: Ib70ef136bbc411504b450456bd9bb705ae93dd25 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> (cherry picked from commit ee4bf638cad9bcf303c8c6ad1f922c33dc021964) Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Add whitespace after control keywordsOrgad Shaneh2012-11-281-3/+3
| | | | | | | | | | | | | | | | find -name \*.cpp -o -name \*.h | \ xargs sed -Ei 's/ (for|foreach|if|switch|while)\(/ \1 (/g' Change-Id: I9efdff4bf0c8c01a52baaaeb75198483c77b0390 Reviewed-by: hjk <qthjk@ovi.com>
* | QmlDesigner: export core functionalityThomas Hartmann2012-11-211-1/+1
|/ | | | | | | | | | | | | We export the core functionality of the model allowing other plugins to use it. The general functionality was already there, but I had to rename the macro to avoid name clashes. Also I renamed the .pri file to avoid confusion. Change-Id: I88203ce9dbfddc8d734e5e232ff71bc0e244e5b8 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* rename QtDebug to QDebughjk2012-08-061-1/+1
| | | | | | | More uniform. Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2 Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlDesigner.model: refactoring for nodeSourceThomas Hartmann2011-06-081-4/+19
| | | | | | | | | | | | | | I changed customParserSource into nodeSource and use it also for components. This means we do not use auxiliaryData anymore with some magic __component_data identifier. To distinguish between CustumParserSource and ComponentSource I introduced the enum NodeSourceType. Also in this patch I added auxiliaryData in the creation of a node. This was useful for prototyping and will help with prototyping/testing in the future. Change-Id: I2152c26c0c767f869f7dce7209abf43f594fd2ad Reviewed-on: http://codereview.qt.nokia.com/399 Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* QmlDesigner.Model: add support for custom parser typesThomas Hartmann2011-05-061-0/+10
| | | | | This patch enables us to create objects with custom parsers like ListModel and XmlListModel.
* Update license.hjk2011-04-131-14/+13
|
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* Merge branch '2.1'con2010-12-171-7/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/basemode.cpp src/plugins/coreplugin/basemode.h src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp src/plugins/debugger/debuggeragents.cpp src/plugins/debugger/debuggeruiswitcher.cpp src/plugins/debugger/debuggeruiswitcher.h src/plugins/projectexplorer/buildconfigdialog.cpp src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp src/plugins/qmldesigner/components/propertyeditor/colorwidget.h src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h src/plugins/qmldesigner/designercore/include/modelutilities.h src/plugins/qmldesigner/designercore/include/nodeinstance.h src/plugins/qmldesigner/designercore/include/propertymetainfo.h src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp src/plugins/qmldesigner/designercore/model/modelutilities.cpp src/plugins/snippets/inputwidget.cpp src/plugins/snippets/snippetscompletion.cpp src/plugins/snippets/snippetscompletion.h src/plugins/snippets/snippetspec.cpp src/plugins/snippets/snippetsplugin.cpp src/plugins/snippets/snippetswindow.cpp src/plugins/snippets/snippetswindow.h src/plugins/texteditor/snippetsparser.cpp src/tools/qml/qmldom/main.cpp tests/manual/trk/runner.cpp tests/manual/trk/trkolddevice.cpp tests/manual/trk/trkolddevice.h tests/manual/trk/trkserver.cpp
| * License headers.con2010-12-171-7/+11
| |
* | QmlDesigner.Model: Add internalId to the ModelNodeMarco Bubke2010-12-011-7/+23
|/ | | | | | There are many int to ModelNode hashes in the views. This patch implement a int to ModelNode hash in the model to make them obsolete. Reviewed-By: Thomas Hartmann
* QmlDesigner: Fix compilation warning (gcc)Kai Koehne2010-06-291-2/+2
|
* Merge remote branch 'origin/2.0'con2010-06-111-0/+10
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/qtcreator.qdoc src/plugins/projectexplorer/taskwindow.h src/plugins/qmldesigner/designercore/model/modelmerger.cpp src/plugins/qmljseditor/qmljshoverhandler.h src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp src/plugins/subversion/subversionplugin.cpp
| * Add script function to the modelMarco Bubke2010-06-101-0/+10
| | | | | | | | This is needed to suppert inline script function of Qml in the designer
* | Fix missing constructor initialisations where it affects codepaths.Bill King2010-06-111-1/+3
|/
View Lorry Controller Status