summaryrefslogtreecommitdiff
path: root/src/plugins/qmldesigner/designercore/include/metainfo.h
Commit message (Collapse)AuthorAgeFilesLines
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@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: fixes warningThomas Hartmann2013-06-111-1/+1
| | | | | | | We get a warning if the operator is used from another module. Change-Id: Ib798037cb6e16fbb2c3fb4fb61d9445a0d5cd93d Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Clean headers in QML-Designer.Friedemann Kleint2013-04-301-2/+0
| | | | | | | | | 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>
* 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>
* | QmlDesigner.metaInfo: rename MetaInfoParser to MetaInfoReaderThomas Hartmann2012-11-221-1/+1
| | | | | | | | | | Change-Id: Ic844e8afd3d3119b4987eac945d294cc364b9af9 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* | QmlDesigner: export core functionalityThomas Hartmann2012-11-211-4/+4
|/ | | | | | | | | | | | | 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>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-1/+1
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@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>
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Update license.hjk2011-04-131-14/+13
|
* QmlDesigner: Fix icc compilation warningKai Koehne2011-03-151-1/+1
| | | | Fix warning 1098: the qualifier on this friend declaration is ignored.
* 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.metaInfo: replace old NodeMetaInfo with new implementationThomas Hartmann2010-12-011-20/+0
|/ | | | | | | | | | | | | | | | | | | | | | The new implementation is based on the QmlJS::Interpreter meta info system and gets its info from parsing qml and qmldumper instead of interogating QDeclarative classes. So we share this code with the Qml TextEditor and this approach is also way more flexible. It also work with different Qt versions. The meta info is now bound to a document/rewriter. The api has changed slightly. subComponentManager: cleanup The SubComponentManager does not have to provide meta info, anymore. propertyParser: cleanup Enums were never properly converted. here. metaInfo: remove old MetaInfo classes Removing the old MetaInfo classes and code
* QuickDesigner: Fully implement versioning support in metatype systemKai Koehne2010-05-121-15/+3
| | | | | | | | | | | | | | | | | Store qml versions in the metatype system. Instead of just assuming e.g. "4, 6" or "4, 7" as default, support passing "-1, -1" as versioning wildcard. When inspecting the qml meta type system, versions are now stored also for types that have no qml name / version. The version of the referenting type is then taken, e.g. there are now entries for "Qt/Object", 4, 7 and "Qt/Object", 1, 0 (from QmlProject, 1, 0). Furthermore, some unused methods were removed, and the logic changed insofar as that a type can have only one direct super type. Reviewed-by: Thomas Hartmann Reviewed-by: Marco Bubke
* QuickDesigner: Update ItemLibrary when imported directories changeKai Koehne2010-05-121-1/+1
| | | | | | | | ItemLibraryInfo has now a signal "entriesChanged()", which the ItemLibrary connects to. To allow this, ItemLibraryInfo was moved from a stack-based to a heap-based class. Reviewed-by: Thomas Hartmann
* QuickDesigner: Factor item library info out into it's own classKai Koehne2010-05-101-4/+5
| | | | Reviewed-by: Thomas Hartmann
* QuickDesigner: Rename ItemLibraryInfo to ItemLibraryEntryKai Koehne2010-05-101-3/+3
| | | | | | | The class represents one single entry in the library, therefore the old name was misleading. Reviewed-by: Thomas Hartmann
* QuickDesigner: Rename "core" directory to "designercore"Kai Koehne2010-05-051-0/+124
Avoids problems when e.g. running 'make clean' - this one tries to delete all files named core.
View Lorry Controller Status