summaryrefslogtreecommitdiff
path: root/src/plugins/qmldesigner/components
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: crashfixThomas Hartmann2012-03-231-1/+1
| | | | | | | | If the node is a component it is not present as an item. Task-number: QTCREATORBUG-7176 Change-Id: I426e2e8bfdf9e0eced566c60e2721d3630ef554a Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* QmlDesigner: crash fixThomas Hartmann2012-03-161-1/+0
| | | | | | | | | | | | | | | | It was a very stupid idea to call QApplication::processEvents(); here to avoid hickups. The processEvents() forces the whole designDocumentController managment to be be reentrant which it clearly is not (and should not be). The reason is simply that resetView is called from there. Adding a "flag" for the processEvents is also not a reasonable option. This was just very bad style. So I remove it. Task-number: QTCREATORBUG-7120 Change-Id: I111cf9421f63b9ce44488f0d274624ff48777cef Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Replaced one-char-stringsRobert Loehning2012-03-072-2/+2
| | | | | | Change-Id: I0bf982b508a237e5b1e6ba3279cb589bae1b1c1d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Normalized connect()sRobert Loehning2012-03-069-20/+20
| | | | | | Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-1532-119/+119
| | | | | | | | 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-26173-175/+175
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Replace Q_WS_MAC with Q_OS_MAC.Morten Johan Sorvig2012-01-261-3/+3
| | | | | | | | | | | | | | | We want to carry over all mac-specific code paths to Qt 5. WS_MAC is no longer set; OS_MAC is. This change is compatible with Qt 4 builds since OS_MAC is set whenever WS_MAC is. (OS_MAC would also be set for the theoretical X11/Mac platform, but that's anyway not a supported configuration for Creator) Change-Id: Ib25d8c4e83e7e27d911124cd48aa17fdb875923f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Small cleanupTobias Hunger2011-11-292-11/+3
| | | | | Change-Id: Ic53d813bff7e30fa560c5d0797eeaa3a4880cdec Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-251-2/+2
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri src/libs/qmljs/qmljstypedescriptionreader.cpp src/plugins/analyzerbase/startremotedialog.ui src/plugins/qmldesigner/designercore/include/rewriterview.h src/plugins/qt4projectmanager/makestep.cpp Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1
| * tr() fixes in formeditorwidgetRobert Loehning2011-11-211-2/+2
| | | | | | | | | | | | Change-Id: Ib67e2bf7cb04c708c09a0c8c811b30ae948276a4 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | UI files: Do not polute the global Ui namespaceTobias Hunger2011-11-243-8/+8
|/ | | | | | | Make sure all ui-files are in the plugin's internal namespace. Change-Id: Ifb2c3093441e8feb89e46f52fbb386fc316cfd13 Reviewed-by: hjk <qthjk@ovi.com>
* Fix qreal is not double.Felix Geyer2011-11-091-2/+2
| | | | | | Change-Id: Ife56e908a67da70ebe5af223b19fc8b99fc3a1d2 Reviewed-by: hjk <qthjk@ovi.com> (cherry picked from commit 3b0f26e23136e60b61203c26075349f1e541f654)
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-03184-370/+370
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlDesigner.documentController: bugfix for crumblebarThomas Hartmann2011-10-311-2/+5
| | | | | | | This fixes a crash bug. Change-Id: Ibfe5c30910fed8b5e3132a05bc6a2eec39d4d308 Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
* QmlDesigner.formeditor: fix captionsThomas Hartmann2011-10-251-11/+13
| | | | | | | | To avoid confusion we rotate item captions and place them on the upper right. Change-Id: I97ba7ef93a8b0a6aa678af6a9ee5f76e649e5baa Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlDesigner.formEditor: layoutfix for full screen modeThomas Hartmann2011-10-201-0/+1
| | | | | Change-Id: I92b2d8c69d50ef0b76b1eb94ea481a442915c2e4 Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
* QmlDesigner.formeEditor: layout fixThomas Hartmann2011-10-201-3/+1
| | | | | | Task-number: QTCREATORBUG-6286 Change-Id: I9b5b56f01d5b4a1b35df95026c4ec090cb7ab7c4 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* QmlDesigner.designDocumentController: fixes update of SubComponentMangerThomas Hartmann2011-10-141-0/+1
| | | | | | | | We have to update the SubComponentManger each time the document changes. Change-Id: Ifb42e3d6b2e123ef651309144ae8f3bbdbe39eb7 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.property: fix specialization of property paneThomas Hartmann2011-10-141-4/+30
| | | | | | | | | | | | If a super class has a specifics pane use it and only autogenerate missing properties. In ItemPane.qml make sure the autogenerated properties come first. Fix the template generation. If not code for any property is generated the template is empty. Change-Id: Ia93c55cd9f428a5ebea12d0e807a7e9ab185f0bd Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* QmlDesigner: crash fixThomas Hartmann2011-10-131-1/+1
| | | | | | | instanceParent() can be invalid. Change-Id: I804879491544500e20426a25515b1997022a102c Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner: code cleanupThomas Hartmann2011-09-203-8/+23
| | | | | | | Change-Id: Id2ce92b7b1f6bc190c0ac4899c951b8f3cff9535 Reviewed-on: http://codereview.qt-project.org/5225 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
* Compile fix.Christian Kandeler2011-09-201-2/+2
| | | | | | | Change-Id: I562441bee0deec56132cea2e6091e1c822442e02 Reviewed-on: http://codereview.qt-project.org/5220 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* QmlDesigner: adding crumblePathThomas Hartmann2011-09-202-4/+108
| | | | | | Change-Id: Ic0d68b145398a161194d2a469e9a2f15fe0901d5 Reviewed-on: http://codereview.qt-project.org/4996 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.designDocumentController: removing instanceThomas Hartmann2011-09-202-6/+0
| | | | | | | | We use DesignModeWidget::curentDocumentController instead. Change-Id: I9129a0611cfbc9997e5adb46597b8846463ef7ca Reviewed-on: http://codereview.qt-project.org/4995 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.formEditor: extending toolbox with crumblePathThomas Hartmann2011-09-202-10/+44
| | | | | | | | Change-Id: Ifcb1b53274f05f7c935c54a2fb4975319459ba9d Reviewed-on: http://codereview.qt-project.org/4993 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marco Bubke <marco.bubke@nokia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner: remove dead codeThomas Hartmann2011-09-196-354/+0
| | | | | | | Change-Id: I2f88af9ef449ee21e646dab7ca23b97836249764 Reviewed-on: http://codereview.qt-project.org/5128 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
* QmlDesigner.formEditor: usablity fixThomas Hartmann2011-09-191-0/+3
| | | | | | | | | Displaying the bounding Rectangle makes no sense for small/thin items. Change-Id: Ia30692e0cfa2641cfe3b4962a2f54f9eafe50201 Reviewed-on: http://codereview.qt-project.org/4984 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
* QmlDesigner.model: bugfix for Qt Quick 2.0Thomas Hartmann2011-09-191-1/+1
| | | | | | | | | | The item itself can have any version. we have to check for the version of QtQuick.Item. Change-Id: I57a992dd09491b7990318e208d98a9c4e0011e56 Reviewed-on: http://codereview.qt-project.org/4983 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
* Merge remote-tracking branch 'origin/2.3'Eike Ziller2011-09-1912-12/+67
|\
| * QmlDesigner.formEditor: use pure virtuel instead of assertThomas Hartmann2011-09-1612-12/+67
| | | | | | | | | | | | | | | | | | Asserting because of unexpected mouse events is evil. Task-number: QTCREATORBUG-6042 Change-Id: Idc21b1cb6bfebead4eab80f6526235164b3f8d54 Reviewed-on: http://codereview.qt-project.org/5090 Reviewed-by: hjk <qthjk@ovi.com>
* | qmldesigner: code stylehjk2011-09-158-251/+251
| | | | | | | | | | | | | | 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.formeEditor: create paintPlaceHolderThomas Hartmann2011-09-122-34/+45
| | | | | | | | | | | | | | Change-Id: I91d3aa94b4e8ac91eeaed98d19722837e590dfdf Reviewed-on: http://codereview.qt-project.org/4673 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* | QmlDesigner.formEditor: improving appearenceThomas Hartmann2011-09-122-23/+18
| | | | | | | | | | | | | | | | Change-Id: Icdc10bb0eca30a4e5d85e5200e1c19b5a846b4e4 Reviewed-on: http://codereview.qt-project.org/4350 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marco Bubke <marco.bubke@nokia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* | QmlDesigner.NodeInstances: Show stripes for items without contentMarco Bubke2011-09-064-3/+58
| | | | | | | | | | | | | | Change-Id: I6c737616d485445d77efd8b6d73b2d8259e5120b Reviewed-on: http://codereview.qt.nokia.com/4288 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* | QmlDesigener.propertyEditor: support for QtQuick 2.0 gradientsThomas Hartmann2011-09-061-1/+1
| | | | | | | | | | | | | | Change-Id: I00c58120080f84a30431c34c5c71866f63aca0e4 Reviewed-on: http://codereview.qt.nokia.com/4212 Reviewed-by: Marco Bubke <marco.bubke@nokia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* | Merge remote-tracking branch 'origin/2.3'Eike Ziller2011-08-302-28/+64
|\ \ | |/ | | | | | | | | | | | | Conflicts: doc/qtcreator.qdoc qtcreator.pri Change-Id: I8b34546dccc031aeeeab03417e9bd3aa7b740472
| * QmlDesigner.propertyEditor: crash fixThomas Hartmann2011-08-221-24/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | If the anchor target does not have a corresponding model node we had a crash. This happens for e.g. Flickable because children is redefined. Task-number: QTCREATORBUG-5829 Change-Id: Ib3f609fe7c29778dd4fdd8ed1ac8526afbb36fe0 Reviewed-on: http://codereview.qt.nokia.com/3327 Reviewed-by: Marco Bubke <marco.bubke@nokia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
| * QmlDesigner.itemLibrary: Use com.nokia.meego for Meego/Harmattan componentsThomas Hartmann2011-08-221-4/+4
| | | | | | | | | | | | | | | | | | | | Also fixing the documentation. Change-Id: Ib40f7cea0be7f800b40272c4aed0babfc53ae433 Reviewed-on: http://codereview.qt.nokia.com/3301 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* | Header cleanup in Qt4ProjectManager.Friedemann Kleint2011-08-181-0/+2
| | | | | | | | | | | | | | | | | | | | Disentangle the covariant returns and introduce convenience accessors. Move internal classes away from Qt4Project. Change-Id: I6c3158988824d2a159b1b3f8ecdf8432c32be2bc Reviewed-on: http://codereview.qt.nokia.com/3216 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Merge remote-tracking branch 'origin/2.3'Eike Ziller2011-08-103-3/+9
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri src/libs/libs.pro src/plugins/debugger/watchwindow.cpp src/plugins/remotelinux/maemopackagecreationstep.h Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
| * QmlDesigner.propertyEditor: fix for alpha == 0Thomas Hartmann2011-08-041-1/+1
| | | | | | | | | | | | | | | | | | "transparent" is an extra case. Task-Number: QTCREATORBUG-5727 Change-Id: If28e8735aacb3dd464b61fb7ed65918d8ea465b2 Reviewed-on: http://codereview.qt.nokia.com/2627 Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
| * QmlDesigner.statesEditor: crashfix for focus handlingThomas Hartmann2011-08-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Ignore changes to the TextEdit if focus gets lost. Reason: an error message (illegal state name) would lead to a crash. For details see the task. Task-Number: QTCREATORBUG-5729 Change-Id: I0f0ad7a416ba59d958b3ae5d8809ccb51f42fe5e Reviewed-on: http://codereview.qt.nokia.com/2624 Reviewed-by: Marco Bubke <marco.bubke@nokia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
| * QmlDesigner.propertyEditor: preserve alpha valueThomas Hartmann2011-08-021-1/+5
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-5683 Change-Id: I5101eb4bdb73938628c0f0acc3ebf16868b53cb2 Reviewed-on: http://codereview.qt.nokia.com/2522 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
| * QmlDesigner.propertyEditor: crash fixThomas Hartmann2011-08-021-0/+3
| | | | | | | | | | | | | | | | We did not handle the case that a gradient is a binding. Change-Id: Ib6892420c6d5de7522cb2b051ff2b046ab781c14 Reviewed-on: http://codereview.qt.nokia.com/2503 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* | Merge branch '2.3'Oswald Buddenhagen2011-07-297-33/+92
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/debugger/qml/qmlengine.cpp Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4
| * QmlDesigner.FormEditor: Skip all move events between a 30 ms time frameMarco Bubke2011-07-271-5/+10
| | | | | | | | | | | | | | | | | | To many move events will stall the local sockets. Change-Id: Iec9a072a6c2e217d19c656d5596c40167ca97675 Reviewed-on: http://codereview.qt.nokia.com/2222 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
| * QmlDesigner.itemLibrary: use QFileSystemModelThomas Hartmann2011-07-273-24/+27
| | | | | | | | | | | | | | | | | | QDirModel is depricated. Task-number: QTCREATORBUG-3134 Change-Id: I21faf0c48a0126db6545893e8f3a86aa5180fffd Reviewed-on: http://codereview.qt.nokia.com/2279 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
| * QmlDesigner.designDocumentController: fix for copy n pasteThomas Hartmann2011-07-261-0/+3
| | | | | | | | | | | | | | | | | | We have to clear the cache of the meta system. Task-number:QTCREATORBUG-5578 Change-Id: I6f7a77609fb5535ade5925a405ae156edfee2b22 Reviewed-on: http://codereview.qt.nokia.com/2215 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
| * QmlDesigner.navigator: keep position while reparentingThomas Hartmann2011-07-262-4/+50
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-3252 Change-Id: I03f335b1bc9943251dffba016ccf1d9b7b1e081e Reviewed-on: http://codereview.qt.nokia.com/2170 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
| * QmlDesigner.propertyEditor: fix for undo/redoThomas Hartmann2011-07-251-0/+2
| | | | | | | | | | | | | | | | | | | | Reseting property editor undo/redo to simplify inner state of the property editor. Task-number: QTCREATORBUG-4672 Change-Id: I5446567e00068a0de1853c0c4271188135df330e Reviewed-on: http://codereview.qt.nokia.com/2104 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
View Lorry Controller Status