aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: Add features to .metainfo fileThomas Hartmann2018-01-231-0/+26
| | | | | | | | | | | | Allows black listing and white listing of imports. The .metainfo files of QML and QmlDesigner plugins currently define the contents of the item library. This patch also allows to blacklist imports in the import manager and to define important imports that can e. g. be added using a tag list. Change-Id: I358cf7abe6dc68d54f33488ae7d164fc10e5ea94 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Read hints for item handlingThomas Hartmann2016-10-061-0/+14
| | | | | | | | This patch allows an arbitrary hints section section for each item in the .metainfo file. Change-Id: I85d7171d1aaacd96a327df3e350978b859913d00 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: trigger item library update after MetaInforReader is finishedTim Jenssen2016-06-081-6/+7
| | | | | | | - this speeds up the start of the QmlDesigner Change-Id: I0fd5804f3aad799a93fd2c47edca8d1ca5c3c454 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* QmlDesigner: handle missing item library images betterTim Jenssen2016-06-081-3/+0
| | | | | | | | | | - in case of missing (image) file it generated a strange path - warn about not existing file path while it reads it from MetaInfoReader, to avoid too much not existing warnings - add the default icon code to the image provider Change-Id: I2ffa9b4f179b82fed73876d3ac006e40d37beae2 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* Keep QT_RESTRICTED_CAST_FROM_ASCII in the designerTim Jenssen2016-03-231-3/+3
| | | | | | | There is no reason to undefine QT_RESTRICTED_CAST_FROM_ASCII (anymore). Change-Id: Iabeacc8a89d662e78986e2dc275c2096a9c9e519 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@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>
* 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 lookup of navigator iconsThomas Hartmann2015-07-141-3/+1
| | | | | | | | | | | | | The version check was simply wrong. The version of the used item might be higher then the version in the item library. We can still use the icon. I removed the version check completely. There is no reason to have different icons for different versions. This just increases the complexity and introduces bugs without any reason/use cases. Change-Id: Ib6d2040490739ee903ffe8eb308cd942b96444aa Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* QmlDesigner: Fix icon names for ItemLibraryEntryMarco Bubke2014-06-121-17/+17
| | | | | | | icon and iconPath are two different icons. Change-Id: I62ab07a13240bc23bc9d807dbd46742ce7d71300 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Move default icon path in getterMarco Bubke2014-06-121-0/+3
| | | | | Change-Id: I752d6694a6a13fe7001675e67b3b7773f142675b Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Remove dragIcon from ItemLibraryMarco Bubke2014-06-121-14/+0
| | | | | | | Was not used any more. Change-Id: I6fbe2e5224cfcf7f6250684f7653b34f3247220a Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner.ItemLibrary: remove forceEntryThomas Hartmann2014-05-071-14/+0
| | | | | | | | | | This feature allowed items to show up in the library even if the import was missing. This feature was error prone and increased the complexity of creating items a lot. Since we now have an import manager this is not required anymore. Change-Id: Ia127077be0b6c82a047cbb8f86ac3ab24e2d82ae 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>
* Braces cleanupOrgad Shaneh2013-11-141-3/+2
| | | | | Change-Id: I8413252c90a1487d291f15d92837c30ab697b245 Reviewed-by: hjk <hjk121@nokiamail.com>
* QmlDesigner.MetaInfo: rename qml() to qmlPath()Thomas Hartmann2013-07-311-2/+2
| | | | | | | qml() is too ambiguous. Change-Id: I7b56f53f64ce349657e3a462769c11880a1afe04 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner.ItemLibrary: Allow non qrc source filesThomas Hartmann2013-05-141-1/+13
| | | | | | | | Source files can also be local files relative to the .metainfo file. Change-Id: I8b5519a1bf42808a1bfa744b7520fc910eb2aeac Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner.ItemLibrary: load QML source on startupThomas Hartmann2013-05-061-0/+12
| | | | | | | | The QML source is now loaded while dragging, which creates hickups. Change-Id: If43e4661881f94d6a6f692981f19a61ac2c0e508 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner: Type of the propertyname is now PropertyNameThomas Hartmann2013-03-251-4/+4
| | | | | | | | | | | 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>
* | QmlDesigner.ItemLibrary: allow overwriting existing entriesThomas Hartmann2012-12-201-2/+2
| | | | | | | | | | | | | | | | Since the item library becomes more dynamic, when we allow .metainfo files in designer sub folders of components we need this. Change-Id: Ib5a5659a0e8e880e109bbb7dca3ae31bf332e451 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* | QmlDesigner: addjusting signature of ItemLibraryEntry::addProperty()Thomas Hartmann2012-11-211-1/+1
| | | | | | | | | | | | | | QVariant is more sensible for a value. Change-Id: Id36036f87d2e60dcad50ca639e5ec43703a37dc5 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* | QmlDesigner: adding QDebug operator for ItemLibraryEntryThomas Hartmann2012-11-211-0/+19
| | | | | | | | | | Change-Id: Idb331096aef29e63f095b7715b82953bf300c0a7 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* | QmnlDesigner.ItemlibrayInfo: include major version into hashThomas Hartmann2012-10-091-1/+1
| | | | | | | | | | Change-Id: I8911d114fb079f550e10b17e89ee220644768543 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-051-21/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessageloghandler.h src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/madde/maemodeployconfigurationwidget.h src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentinfo.h src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/ichecklib_global.h tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h tests/manual/ssh/tunnel/tunnel.h Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
| * Adjust license headershjk2012-10-051-21/+20
| | | | | | | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | QmlDesigner.itemLibrary: fixThomas Hartmann2012-09-061-1/+1
| | | | | | | | | | | | | | Fixing typo caused during refactoring. Change-Id: Ibd0499bf9a77b9f754b92bbf0123506528331efe Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
* | QmlDesigner: Remove ItemLibraryInfoPrivateMarco Bubke2012-08-301-30/+18
|/ | | | | Change-Id: I66340a32e7627432b8a0f7b1fc8e71486303c6a3 Reviewed-by: Alessandro Portale <alessandro.portale@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>
* all: less QScopedPointerhjk2011-09-191-0/+1
| | | | | | Change-Id: I536bdb4d4f0c10fa858560f3c160fc0fff8da9b2 Reviewed-on: http://codereview.qt-project.org/5116 Reviewed-by: hjk <qthjk@ovi.com>
* qmldesigner: code stylehjk2011-09-151-16/+16
| | | | | | | Change-Id: I4088695312de5ea526578c6b901a79a9662797b8 Reviewed-on: http://codereview.qt-project.org/4961 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.itemLibraryInfo: add qml property for libraryThomas Hartmann2011-06-241-0/+2
| | | | | | | Change-Id: I986cef3a15d6332f1dcf7c0ca4cd035cc0751e76 Reviewed-on: http://codereview.qt.nokia.com/719 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.metaInfo: extending itemlibrary infoThomas Hartmann2011-05-161-0/+13
| | | | I added forceImport.
* Avoid using values() to iterate over QMap/QHash containersThorbjørn Lindeijer2011-05-121-1/+1
| | | | | | | It's more performant to iterate over the values directly than to first stick them into a new container. Reviewed-by: Thomas Hartmann
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* 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
| |
* | QmlDesigneritemLibrary: relax condition for entriesForType()Thomas Hartmann2010-12-161-2/+2
| | | | | | | | >= is makes more sense for providing icons etc...
* | QmlDesigner.itemLibrary: allow entry names used twiceThomas Hartmann2010-12-151-11/+11
| | | | | | | | Use name + category for identification needed some refactoring.
* | QmlDesigner.itemLibrary: add requiredImportThomas Hartmann2010-12-091-0/+15
| |
* | QmlDesigner.itemLibrary: The item library now also provides small iconsThomas Hartmann2010-12-011-0/+5
|/ | | | The item library now also provides small icons for the navigator.
* Fix QmlDesigner following removal of Image::pixmap property. This createsBea Lam2010-07-131-2/+10
| | | | | | | image providers to supply pixmaps so that the Image::source property can be used instead. Reviewed-by: kkoehne
* QuickDesigner: Update ItemLibrary when imported directories changeKai Koehne2010-05-121-61/+37
| | | | | | | | 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: Clean up ItemLibraryInfo classKai Koehne2010-05-121-37/+32
| | | | | | Remove dependencies to QMetaInfo & unify method names. Reviewed-by: Thomas Hartmann
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 11:06:19 +0000