summaryrefslogtreecommitdiff
path: root/src/plugins/qmldesigner/designercore/instances
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: using 4.8 datastream also in Qt 5Thomas Hartmann2012-09-271-0/+4
| | | | | | Change-Id: If208a0e3d8342fb62fff1ec2475134cdf4f9dcee Reviewed-by: Marco Bubke <marco.bubke@digia.com> (cherry picked from commit 36f9c318abe783d6ff00199e9ee280e7b8faf702)
* QmlDesigner: unused private headerThomas Hartmann2012-09-271-1/+0
| | | | | | Change-Id: Ife75552afb9d96ac760b0d37f0dbd772a35c498c Reviewed-by: Marco Bubke <marco.bubke@digia.com> (cherry picked from commit 419aabcd2c05ed67067b4d3b905145f505e887dc)
* rename QtDebug to QDebughjk2012-08-062-2/+2
| | | | | | | More uniform. Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2 Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-194-12/+4
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Replaced one-char-stringsRobert Loehning2012-03-071-2/+2
| | | | | | Change-Id: I0bf982b508a237e5b1e6ba3279cb589bae1b1c1d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Long live the king!hjk2012-01-262-2/+2
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-034-8/+8
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlDesigner.instances: support for auxiliaryData @NodeInstanceThomas Hartmann2011-09-201-1/+1
| | | | | | | | | | This allows overwriting values in node instances only. Change-Id: I596323a9ebc112033c9811a8aaf35fed371cb867 Reviewed-on: http://codereview.qt-project.org/4924 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-062-6/+12
| | | | | | | 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>
* QmlDesigner.NodeInstances: Better handling of qml puppet problemsMarco Bubke2011-07-201-22/+28
| | | | | | | | | Task-number: QTCREATORBUG-4909 Change-Id: I4cad62e379ba66c3ab9eddb2d770f39eb1e07ff8 Reviewed-on: http://codereview.qt.nokia.com/1901 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner: Fix state switchingMarco Bubke2011-07-131-8/+25
| | | | | | | | | Task-number: QTCREATORBUG-4062 Change-Id: I2a04c5a04ef40390772fe46f587bc60c02a4bab1 Reviewed-on: http://codereview.qt.nokia.com/1605 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.instances: fix qml2puppet checkThomas Hartmann2011-07-121-5/+5
| | | | | | | | | | | We now check for Qt Quick 2 instead of Qt Quick 1. This fixes issues with webview and confusion if there arent any imports. Change-Id: I5979996dd618a88e96cb09ef24744f1f9bd51c47 Reviewed-on: http://codereview.qt.nokia.com/1506 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: Prevent item hoping for reparentingMarco Bubke2011-07-063-0/+42
| | | | | | | | | | | Because of the asynchronous nature of the formeditor the item can be between to states. This looks like the item is hoping around. To prevent this a token is sent to the instances and back. For the time frame the painting is disabled. Change-Id: If7e937cba8171248464ad350bb14438c020b25f9 Reviewed-on: http://codereview.qt.nokia.com/1189 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Fix original string messagesJarek Kobus2011-07-051-1/+1
| | | | | | | Change-Id: Icc7819585a8382a02b02a28f39dcea8ec1c6a7e6 Reviewed-on: http://codereview.qt.nokia.com/1142 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* QmlDesigner: Fix wrong position for reparentingThomas Hartmann2011-06-301-5/+18
| | | | | | | | | Change-Id: Ie9d9a739e559d5cfc06849ff3e5c086e9ab2224c DoneBy: Marco Bubke Task-number: QTCREATORBUG-3962 Reviewed-on: http://codereview.qt.nokia.com/958 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Compile.Friedemann Kleint2011-06-281-2/+2
| | | | | | | Change-Id: I47930a90b122c7b3863095e0ee4bfac61dba9cd8 Reviewed-on: http://codereview.qt.nokia.com/834 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QmlDesigner: Fix slowness for many itemsMarco Bubke2011-06-282-24/+188
| | | | | | | | | | | The information change notifier provided no hint which infotmation changed. So the property editor has updated the anchors for all information changes. Now there is a hint and the update is only happen for a anchor change. Change-Id: I3b6d7546f43bce4c08757662e7af32604a8db56f Reviewed-on: http://codereview.qt.nokia.com/811 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.instances: allow fallback to itemThomas Hartmann2011-06-281-2/+13
| | | | | | | | | | | | If we know from the (text editor) meta system that an object is an (visible) item, we always create an item as fallback. We might not be able to instaciate the original item. Change-Id: I6851cd7a8de68d9d09b789927c204f0617017de7 Reviewed-on: http://codereview.qt.nokia.com/829 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
* QmlDesigner.nodeInstances: use a Qt qmlpuppet if presentThomas Hartmann2011-06-222-13/+37
| | | | | | | | | | | | Use a Qt qmlpuppet if present, otherwise fallack to the puppet provided by Qt Creator. We look into bin/qmlpuppet(.app/.exe) Change-Id: I057e9ce7cbcc6f3e9926eef482f7f2a34d902aa3 Reviewed-on: http://codereview.qt.nokia.com/441 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
* QmlDesigner.NodeInstances: Scene Graph prototypeMarco Bubke2011-06-221-0/+10
| | | | | | | Change-Id: I0c72519f637f260869b2a76b2a3cc7ece46aef57 Reviewed-on: http://codereview.qt.nokia.com/573 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* tr()-Fixes for 2.3: Small spelling/notr-fixes.Friedemann Kleint2011-06-201-1/+6
| | | | | | | | QML Profiler,etc. Change-Id: Ie4c5b6152735b45257856340797b446c3360edd5 Reviewed-on: http://codereview.qt.nokia.com/493 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QmlDesigner.nodeInstanceView: adding parameter pathToQtThomas Hartmann2011-06-093-4/+10
| | | | | | | | | The NodeInstanceView is now informed about the build pathToQt. Change-Id: I728c9c356354ccf73599950c1c0bf4a96bd0a628 Reviewed-on: http://codereview.qt.nokia.com/437 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
* QmlDesigner.nodeInstances: on windows executables end with exeThomas Hartmann2011-06-091-4/+7
| | | | | | | | | | On Windows executables have the suffix ".exe" I also enclosed the strings with QLatin1String Change-Id: Idf7a16ca6e0370f091225aaea7137418d8563aaf Reviewed-on: http://codereview.qt.nokia.com/436 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
* QmlDesigner.NodeInstances: Support for Qt five scene graphMarco Bubke2011-06-09106-13023/+77
| | | | | | | | | | QmlPuppet only supported GraphicsView. There is now Qml2Puppet which is supporting the new Qt Scene Graph. Change-Id: Ia0a06639cf6852192e84f7bfc2bea60532890b08 Reviewed-on: http://codereview.qt.nokia.com/433 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.nodeinstances: adding missing filesThomas Hartmann2011-06-082-0/+129
| | | | | | | Change-Id: Ied53326c2f8c92b9af28591496e118eef69790b8 Reviewed-on: http://codereview.qt.nokia.com/410 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.model: refactoring for nodeSourceThomas Hartmann2011-06-0821-158/+263
| | | | | | | | | | | | | | 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>
* QmlDesigner: Fix warningsTobias Hunger2011-06-083-2/+3
| | | | | | | Change-Id: I21d103153dd0cebaf69ae57cbf19cfabd3ec3ead Reviewed-on: http://codereview.qt.nokia.com/385 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.NodeInstances: Refactor NodeInstanceServerMarco Bubke2011-05-1210-134/+472
| | | | | | | NodeInstanceServer is now abstract. The informations are now sent by the InformationNodeInstanceServer. Reviewed-By: Thomas Hartmann
* Avoid using values() to iterate over QMap/QHash containersThorbjørn Lindeijer2011-05-121-4/+3
| | | | | | | It's more performant to iterate over the values directly than to first stick them into a new container. Reviewed-by: Thomas Hartmann
* QmlDesigner.nodeInstances: avoid conversionThomas Hartmann2011-05-111-1/+1
|
* QmlDesigner.nodeInstances: allow qDebug for InformationChangedCommandThomas Hartmann2011-05-114-0/+71
|
* Krazy fixes (spelling, single char strings, char constants).Friedemann Kleint2011-05-101-1/+2
|
* Fix/add copyright headersTobias Hunger2011-05-06100-100/+100
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Fix compilationDaniel Molkentin2011-05-066-6/+6
|
* QmlDesigner.instanceView: do not skip Models anymoreThomas Hartmann2011-05-061-4/+10
| | | | | We only skip Model if they are the root node. I kept the isSkippedNode since it might become useful again.
* QmlDesigner.instances: support QVariant properties as parent propertyThomas Hartmann2011-05-061-1/+3
| | | | | QVariants can store QObjects. The model property of ListView is a QVariant for example.
* QmlDesigner.instances: use QtQuick 1.0 instead of Qt 4.7Thomas Hartmann2011-05-061-1/+1
|
* QmlDesigner.Model: add support for custom parser typesThomas Hartmann2011-05-0617-17/+246
| | | | | This patch enables us to create objects with custom parsers like ListModel and XmlListModel.
* QmlDesigner.rewriter: __model_data becomes an auxiliaryDataThomas Hartmann2011-05-061-0/+26
| | | | | | I also added __model_data and fixed some bugs. Implicit components with Component {} e.g. delegate are now explicit components in the model to avoid confusion.
* QmlDesigner.nodeInstances: crash fixThomas Hartmann2011-05-061-2/+2
| | | | | | | | | In some cases object() != m_nodeInstance->object(). Reading on the worng type of QObject can lead to very interesting effects. (e. g. decrementing the pointer to the vtable) Task-Nr: QTCREATORBUG-4675 Reviewed-by: Marco Bubke
* QmlDesigner.NodeInstances: Support global propertiesMarco Bubke2011-05-031-1/+5
|
* QmlDesigner.NodeInstances: more stable reparentingMarco Bubke2011-05-032-4/+7
|
* Merge remote branch 'origin/2.2'con2011-04-271-2/+7
|\ | | | | | | | | | | | | Conflicts: src/plugins/projectexplorer/gcctoolchain.cpp src/plugins/projectexplorer/target.cpp src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
| * QmlDesigner.qmlPuppet: fixes a bug when dragging in a WebView on KDEThomas Hartmann2011-04-261-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebView object contains a QIcon property ("reload.icon"), which fails to be streamed from the puppet (client) to Qt Creator (server). The QIcon is created by a 'KIconEngine' in the KDE case. which isn't found on the QtCreator side. This leads operator>> in qicon.cpp to not read anything from the buffer at all ... leading to all following properties being invalid, since read from the wrong bytes in the stream. Solution: Since QIcon leads to problems and we have no current use case for a QIcon property in Bauhaus we just ignore properties of type QIcon. Reviewed-by: Marco Bubke Task-number: QTCREATORBUG-4596
* | Fix compiler warnings.Friedemann Kleint2011-04-202-3/+0
| |
* | QmlDesigner.NodeInstances: Track lost commandsMarco Bubke2011-04-194-6/+56
| |
* | Fix more krazy warnings.Friedemann Kleint2011-04-191-1/+1
|/
* QmlDesigner.nodeInstances: show warning if qml pupped crashesThomas Hartmann2011-04-151-1/+1
| | | | | | If the qml puppetcrahes 3 times in a row we show a warning. Reviewed-by: Marco Bubke
* Update license.hjk2011-04-13100-1400/+1300
|
* QmlDesigner.NodeInstances: Use dummy data for components tooMarco Bubke2011-04-122-0/+54
| | | | Reviewed-By: Thomas Hartmann
View Lorry Controller Status