aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/qmldesigner.qbs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/qds-1.59' into 4.13Tim Jenssen2020-06-261-0/+1
|\ | | | | | | | | | | | | | | | | Conflicts: src/plugins/clangformat/clangformatplugin.cpp src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp src/plugins/qmldesigner/qmldesigner.qbs Change-Id: Ie4a0beeb9fd32ac9683f4e8769988a9c3f3e369a
| * AssetExporter: Add plugin to cmake and qbs build systemVikas Pachdha2020-06-171-0/+1
| | | | | | | | | | Change-Id: I2b48a854ed4e5e94cab73883f8b0f41d0ed15697 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | qbs build: Add qmlpreviewplugin.qbsIvan Komissarov2020-05-131-0/+1
|/ | | | | | | | The project file was missing from the build tree Change-Id: I8f7d760700ec17ef9f46ef71b2378739e1f2ab18 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* qbs build: Un-break and re-add QmlDesigner product.Christian Kandeler2016-05-171-473/+8
| | | | | Change-Id: I2d4c069ef2d566ed466f0ba6a4f24a90ea6ffba9 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Themed Icons: Introduce Utils::IconAlessandro Portale2015-11-251-0/+1
| | | | | | | | | | | | | | Instead of describing icons via file name or in the themed icons case via a string that is a list of mask/color pairs, we have now a class for it. Icons are now listed in per-plugin *icons.h headers. RunControl::m_icon was The only place left where an icon property was in fact a string. This patch changes that member to be a Utils::Icon. Change-Id: Ibcfa8bb25e6d2e330c567ee7ccc0b97ead603177 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* QmlDesigner: clean up QWeakPointer useTim Jenssen2014-09-051-1/+0
| | | | | Change-Id: I314519f7458d4b87e2056cca1ce35f8604f1f51f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* use new base import style in qbs filesJoerg Bornemann2014-03-111-1/+1
| | | | | | Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Rename plugins/qt4projectmanager to qmakeprojectmanagerhjk2013-10-291-1/+1
| | | | | | | This finally renames the plugin itself. Change-Id: Ibdf4f4b4e9776c2fdc809e0127f3e1310de44bd1 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* qbs project files: Make use of new qbsSearchPaths property.Christian Kandeler2013-10-091-1/+1
| | | | | Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove duplicate module dependencies from qbs files.Christian Kandeler2013-05-271-1/+0
| | | | | | | These cause a warning now. Change-Id: I4c4e9c3e11e7f97e66a4bcdd708489fafc8f0606 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QmlDesigner: remove ViewLoggerThomas Hartmann2013-04-021-2/+0
| | | | | | | We now have the DebugView Change-Id: I3b1cc313a9158469b51c1fd9926c29369471503e Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner: Add missing headerOrgad Shaneh2012-12-061-0/+1
| | | | | Change-Id: Ie94aeac387e8e783b85341a736f4034245cc12b2 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-181-1/+1
|\ | | | | | | | | | | | | Conflicts: share/share.qbs Change-Id: I2ab6080a8cc5315191b33c6df21a835df888a291
| * Adapt .pro, .qbs files and wizard templates to QtQuick1-renaming.Friedemann Kleint2012-10-181-1/+1
| | | | | | | | | | | | | | | | QtQuick1 is now (again) called QtDeclarative. Change-Id: Ic75f1a47e972cac470730b53e102e9ab71548c47 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | qbs files: Consolidate includePaths in QtcLibrary and QtcPluginOrgad Shaneh2012-10-051-7/+3
| | | | | | | | | | | | | | Avoid using "." as includePath when it is unneeded Change-Id: I9bc6f4ebe50409f49782520033fd5f098aed10d0 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | qbs files: Sort filesOrgad Shaneh2012-10-031-6/+6
| | | | | | | | | | Change-Id: I6514deb70162bd52687e6143813bcf1325a797db Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | qbs files: Group and sort QmlDesignerOrgad Shaneh2012-10-011-407/+430
| | | | | | | | | | Change-Id: I38930748f4c2f5540f2a631f04020f783c35612b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-09-271-3/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h share/qtcreator/qml/qmlpuppet/commands/tokencommand.h share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp src/plugins/git/gitsettings.cpp tests/manual/ssh/remoteprocess/remoteprocesstest.h Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
| * Fix qbs buildOrgad Shaneh2012-09-271-3/+1
| | | | | | | | | | Change-Id: I7b0c983a2a99228595a6daa1da95ca863ba66bcc Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Exclude the qml designer from the qbs build.Christian Kandeler2012-09-191-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | The qbs build of this plugin is constantly being broken by its maintainers. Due to its convoluted structure, it's hard for others to keep the qbs files up to date, so we give up on that for now. We can re-enable it later if and when there is more consideration for qbs. (This patch also contains one last build fix.) Change-Id: I37f8bea3ee65cb62857e7d6649eab4e6d129eb5b Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* | Support built-in testing infrastructure with qbs build.Christian Kandeler2012-09-131-1/+1
| | | | | | | | | | | | | | | | I.e. define WITH_TESTS for debug builds or if the respective environment variable is set. Change-Id: I2764ece50d0783e8cb030b1695e6f59cf6063248 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | QmlDesigner: Fix qbs build.Christian Kandeler2012-09-101-2/+2
|/ | | | | | | Was broken by Ia67a055a4beac33477485d05574134ffe4dc6ae1. Change-Id: I8dda4db78198e384613939c43be471d1908ffafc Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* QmlDesigner: Fix qbs build.Christian Kandeler2012-08-221-16/+0
| | | | | | | Was broken by I03935715e51777efffea533310a9d775cb676dca. Change-Id: I8395809db4d18da3ecafccbcb1221e0c8dfca70c Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Fix qbs code styleYuchen Deng2012-06-191-3/+3
| | | | | Change-Id: Ia3e4df528d391580064efbeeab75016335a4299d Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* qbs files: build with Qt5Joerg Bornemann2012-04-101-0/+2
| | | | | | | Help plugin and QmlDesigner have been disabled for Qt5. Change-Id: I9345d0fd00f9a575333dc972cc7adbdf146cd6cb Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* qbs files: use Qt5 module dependenciesJoerg Bornemann2012-04-101-1/+1
| | | | | | | | | | Renamed gui -> widgets. Renamed declarative -> quick1. With qbs the usage of qt.widgets and qt.quick1 with Qt4 is supported. Change-Id: I6cadaf34527f1f880d74ced7d2d18dd9801b7de1 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* qbs files: build QmlDesigner pluginJoerg Bornemann2012-04-021-0/+475
Change-Id: I850b2be8431803aac9d41fcaf40c89e6a1dd5a2c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 17:36:48 +0000