Commit Graph

8660 Commits

Author SHA1 Message Date
Marco Bubke
6c2a84a736 QmlDesigner.NodeInstances: Fix repaint bug
The dirtySceneTransform flag isn't reset by resetDirtyItem(). So we do it now
manually.

Change-Id: I2a908c18b2e05e9b6f40dc2994e765c37197a6d5
Reviewed-on: http://codereview.qt.nokia.com/848
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-06-28 17:40:36 +02:00
Thomas Hartmann
e802690dbd QmlDesigner.propertyEditor: adding MouseAreaSpecifics.qml
Change-Id: I407d72f904dc34f5c26d0724a6ec2ae134021d96
Reviewed-on: http://codereview.qt.nokia.com/847
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-06-28 17:34:11 +02:00
Marco Bubke
ddb602536c QmlDesigner: Fix painted bounding rectangle for step childs
We used only the bounding rectangle of the item under our control. But child
items which are created in a component can be out side of the bounding
rectangle. To fix compute a combined bounding rectangle of the item and all
stepchildren. Stepchildren described the child not create directly by us.

Change-Id: I7f25f112aa5eb2f80cfccec5d358221ab5e35d9b
Reviewed-on: http://codereview.qt.nokia.com/839
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-06-28 16:26:26 +02:00
Marco Bubke
2d4b5fcb65 QmlDesigner: Fix slowness for many items
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>
2011-06-28 13:47:56 +02:00
Thomas Hartmann
08e4b339f1 QmlDesigner.instances: allow fallback to item
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>
2011-06-28 13:36:48 +02:00
Christian Kamm
074ba8d142 QmlJS: Update builtin type descriptions for Qt 5
qtdeclarative b2e2b070c499a04a3e2f270df62d5dd061e0c027

Change-Id: I8a6b5e0ffec996add654a2a8bf12f856349d71ab
Reviewed-on: http://codereview.qt.nokia.com/823
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-06-28 12:17:12 +02:00
Marco Bubke
0fcc6afd8f QmlDesigner: Split between bounding rectangle and painted bounding rectangle
In qml the interactive bounding rectangle is always
QRectF(0, 0, width, height). The painted bounding rectangle can differ from
this logical one. This change is much more near to the qml description.

Change-Id: I139cb70512fa1ed003b28ca2ae512f4e33e915e5
Reviewed-on: http://codereview.qt.nokia.com/812
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-06-28 10:25:10 +02:00
Friedemann Kleint
33256aa617 L10n: Update German translation for 2.3.
Change-Id: Id98dfc282737f10e17660b36efc57c67fdeb9bf6
Reviewed-on: http://codereview.qt.nokia.com/816
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-06-28 08:44:03 +02:00
Marco Bubke
52dcd28275 QmlDesigner.NodeInstances: Reduce repaints
Change-Id: I39e7eae1036ee79689ccd49bfe900fee93a3454b
Reviewed-on: http://codereview.qt.nokia.com/808
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
2011-06-27 21:34:42 +02:00
Christian Kamm
14a74f336a qmldump: Fix export comparison.
Compare the full uri/name, not just the uri. Also
QDeclarativeType::module was not available in 4.7.3.

Change-Id: I0d04d826c72d4aed5d70c3c65a1f97ad5872827c
Reviewed-on: http://codereview.qt.nokia.com/759
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-06-27 11:41:38 +02:00
Thomas Hartmann
c4eae3adbc QmlDesigner.propertyEditor: adding checkbox_tr.css
Change-Id: I10094f4cd4dae6fa3af0ea3497cbb9ed74c777f1
Reviewed-on: http://codereview.qt.nokia.com/734
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-06-24 17:33:36 +02:00
Thomas Hartmann
cf39ee315b QmlDesigner.nodeInstances: improving warnings if building qmlpuppet fails
Change-Id: I7dfecd8e0ad0016748ef4513cf0364e8dcd7d121
Reviewed-on: http://codereview.qt.nokia.com/715
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-06-24 16:19:01 +02:00
Kai Koehne
5c9b8946ce QtQuickApp wizard: Add Qt Components for Meego/Harmattan
Change-Id: I4809de36e4913037439ab9eb7c56021431cff365
Reviewed-on: http://codereview.qt.nokia.com/704
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-06-24 15:50:45 +02:00
Kai Koehne
cdda5c775d Revert "QtQuickApp wizard: Add option for QtQuick 1.1 module"
This reverts commit 31904563bb.
The option in the UI might actually confuse users: For the time being
we'll just keep 1.0 as the namespace.

Change-Id: Ifc7b46227d57ec8d246c8f7818d5a619ef0cd3bd
Reviewed-on: http://codereview.qt.nokia.com/699
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-06-24 15:36:28 +02:00
Christian Kamm
42c9175d19 QmlJS: Manually fix location qmltypes.
The new location plugin does not export some of the 1.1 types anymore.
I've manually added the missing exports.

Change-Id: I19886a40fa61ab01f21b581fee315619f98668fd
Reviewed-on: http://codereview.qt.nokia.com/689
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-06-24 10:22:05 +02:00
Oswald Buddenhagen
1d78e594d8 Merge branch '2.2'
Conflicts:
	qtcreator.pri
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
	src/libs/qmljs/qmljsdocument.cpp
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/libs/qmljs/qmljslink.cpp
	src/plugins/cppeditor/cppquickfixes.cpp
	src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp
	src/plugins/qmldesigner/qmldesigner.pro
	src/plugins/qmldesigner/symbianplugin/symbian.metainfo
	src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h

Change-Id: Id5f754e2837a3bb3e0687ed09f1dda45fd0c5617
2011-06-23 19:47:50 +02:00
Kai Koehne
31904563bb QtQuickApp wizard: Add option for QtQuick 1.1 module
Technically it's just one line in the generated file, but might
avoid people be confused on why there is only QtQuick 1.0 as an option.

Change-Id: I61fb4e82d8ee71fe6fddcd6845b4b48e78004e81
Reviewed-on: http://codereview.qt.nokia.com/625
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-06-23 14:36:52 +02:00
hjk
3de50895eb debugger: update our gdb patches
Change-Id: I1c81b28ab22ec11dcef1f58030b5906f4fc6323c
Reviewed-on: http://codereview.qt.nokia.com/652
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-06-23 12:31:30 +02:00
hjk
786de8a7e6 debugger: correct comment in dumper.py
Change-Id: Ic1d33180515ad79c4233b013ec7d3530674d5117
Reviewed-on: http://codereview.qt.nokia.com/651
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-06-23 12:31:17 +02:00
hjk
91c44b26c9 debugger: remove listing of breakpoints in dumper code
This was meant to provide breakpoint notifications which are available
in gdb 7.3.50.x now.

Change-Id: I09ced542bb5171f10350b9dc722cab3376d1ded8
Reviewed-on: http://codereview.qt.nokia.com/650
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-06-23 12:31:06 +02:00
Christian Kamm
46e970c37c qmldump: Fix for extended objects.
Before, extended objects had the same exports as the base object
which lead to trouble.

Change-Id: Id40f0e0fd2211db95020ce224cf2c52939e68df7
Reviewed-on: http://codereview.qt.nokia.com/642
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-06-23 11:01:15 +02:00
Marco Bubke
8fe3302329 QmlDesigner.NodeInstances: Move qmlpuppet to share
Change-Id: Id50d8c6130e9d5169a74015bc24e84de64eabfa7
Reviewed-on: http://codereview.qt.nokia.com/634
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-06-22 18:24:36 +02:00
Kai Koehne
8ec524910a QtQuickApp wizard: Use qsTr() for string
Change-Id: Ie2f40065c000b5bf588a0cd5470ec42091080c97
Reviewed-on: http://codereview.qt.nokia.com/621
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-06-22 18:05:36 +02:00
hjk
ff94d06ae3 debugger: fix gcc 4.4's std::map display
Was mentioned at

http://www.qtcentre.org/threads/41700-How-to-watch-STL-containers-iterators-during-debugging.

gcc 4.4 does not encode the allocator type properly so it can't be used
to extract the 'pair type' in the dumper.

Change-Id: I2cb09ce59865a87dc954fce433aef4826111a95a
Reviewed-on: http://codereview.qt.nokia.com/632
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-06-22 17:46:56 +02:00
Feetu Nyrhinen
2964f7a9fa Qt Quick Components Wizard
Selection of Qt Quick component set
and use of specific QML template files (Qt Quick 1.0 and
com.nokia.symbian 1.0) based on the user selections.

Change-Id: I93cfa8735dcf285c76ff04a6186a4eca1f90a361
Reviewed-on: http://codereview.qt.nokia.com/567
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-06-22 15:26:55 +02:00
hjk
96d19ffff0 debugger: update manual tests
Task-number: QTCREATORBUG-5184, QTCREATORBUG-5106
Change-Id: Icc43f534755f897eeea5333186b84fec91dbb8c0
Reviewed-on: http://codereview.qt.nokia.com/606
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-06-22 14:00:16 +02:00
Friedemann Kleint
b979ff833e L10n: Adapted German translation to UI text fixes.
and RemoteLinux reshuffle.

Change-Id: I0963a49916b24989bdefc60f6ace8be4bc33e8b3
Reviewed-on: http://codereview.qt.nokia.com/584
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-06-22 10:27:03 +02:00
Jarek Kobus
27da3098ad Update Polish translations
Change-Id: Ice5da1c1036d8704cade3b12941a8175f068b1a2
Reviewed-on: http://codereview.qt.nokia.com/557
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
2011-06-22 09:57:36 +02:00
Thomas Hartmann
723a20488b QmlDesigner.propertyEditor: adding translation support
Adding support for qsTr()

Change-Id: Ib678820c40e910f744d9722e7958225dcc115d70
Reviewed-on: http://codereview.qt.nokia.com/565
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-06-21 16:12:36 +02:00
Christian Kamm
85d94ff51a QmlJS: Add qsTr to Text snippet.
Change-Id: I8ca84c7b42860ea7875206c9198d8a75905a1b45
Reviewed-on: http://codereview.qt.nokia.com/550
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-06-21 14:32:09 +02:00
Christian Kamm
4adaecda27 qmldump: Add -v option.
Change-Id: Ia55bf314c37455647cf67f42222f7b6a483ba97e
Reviewed-on: http://codereview.qt.nokia.com/543
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-06-21 14:07:02 +02:00
hjk
f446bebadc debugger: with gdb 7.3 we can have proper display of dynamic types.
So use it.

Change-Id: If33d087a9b767f0b2e6b16e57a36e9e7aa6e7c16
Reviewed-on: http://codereview.qt.nokia.com/522
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-06-20 17:38:23 +02:00
hjk
cc43a59763 debugger: make QModelIndex and QAbstractItemModel dumper work on core files
Change-Id: I299334f2b552d4b051dfd9d0d4d85a54b92d0c2d
Reviewed-on: http://codereview.qt.nokia.com/497
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-06-20 11:34:10 +02:00
Friedemann Kleint
7c11374f90 L10n: German translation for 2.3.
Change-Id: I33889fba7a9b7dfcf4fb84188fc0526230005e12
Reviewed-on: http://codereview.qt.nokia.com/494
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-06-20 10:49:15 +02:00
Friedemann Kleint
8a841546b9 tr()-Fixes for 2.3: Small spelling/notr-fixes.
QML Profiler,etc.

Change-Id: Ie4c5b6152735b45257856340797b446c3360edd5
Reviewed-on: http://codereview.qt.nokia.com/493
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-06-20 10:48:36 +02:00
Christian Kamm
74d015d2a9 Update QtMobility QML type descriptions to 1.2.0.
Change-Id: I31b0f9cc55763d22dbf6ff75252c6e10e5a1b0f2
Reviewed-on: http://codereview.qt.nokia.com/481
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-06-15 14:47:15 +02:00
Sergey Belyashov
08a28aacad Updated Russian translation
Merge-request: 346
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: Ied278c283575809b54f4bfb4e8fcda9fe38eb56b
2011-06-14 14:06:05 +02:00
Sergey Belyashov
1f05dec2fc Updated Russian translation
Merge-request: 343
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: Ie49d1abad19c69278767bf32f2a7fa908234293d
2011-06-09 14:37:32 +02:00
Kai Koehne
fa3976b3f1 Add TARGET.EPOCALLOWDLLDATA=1 to Qml Plugin Wizard
Needed for Symbian.

Task-number: QTCREATORBUG-3507
Reviewed-by: Tim Jenssen
Reviewed-by: Alessandro Portale
Change-Id: I35799cd388e44353d6890fe79a411fbed2fb2ef3x
Reviewed-on: http://codereview.qt.nokia.com/394
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-06-08 16:32:11 +02:00
Leandro Melo
1bc9275917 Editors: Change Link color from inkpot scheme
In addition for the report below, the cmake highlighter
now uses the keyword color for functions. This was done
in the previous commit: 5ecd885af3d25acfd8f688428268da2d9198a1bd

Task-number: QTCREATORBUG-5037
Change-Id: I7cdf11d0b13cdf7fbd6fac9bfbe715944c57c5a2x
Reviewed-on: http://codereview.qt.nokia.com/274
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
(cherry picked from commit c09c870248)
Reviewed-on: http://codereview.qt.nokia.com/393
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-06-08 16:32:03 +02:00
hjk
16a1b2c10e debugger: adjust dummy test ObjectPrivate layout for Qt 4.8 changes
Change-Id: I35914e79dce4894a5ec7f0ee656b86e4ce13e2a9
Reviewed-on: http://codereview.qt.nokia.com/365
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-06-07 17:26:32 +02:00
hjk
2f29eafcad debugger: always use tempfile module
Change-Id: Icd9c3be33ecd69c5ada48108e783f7b5b2967557
Reviewed-on: http://codereview.qt.nokia.com/272
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-05-31 16:07:14 +02:00
Leandro Melo
c09c870248 Editors: Change Link color from inkpot scheme
In addition for the report below, the cmake highlighter
now uses the keyword color for functions. This was done
in the previous commit: 5ecd885af3d25acfd8f688428268da2d9198a1bd

Task-number: QTCREATORBUG-5037
Change-Id: I7cdf11d0b13cdf7fbd6fac9bfbe715944c57c5a2
Reviewed-on: http://codereview.qt.nokia.com/274
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
2011-05-31 16:00:15 +02:00
Thorbjørn Lindeijer
edca313d53 QmlJSDebugger: Removed leftover connect statement
It was trying to connect a no longer existing signal to a no longer
existing slot.

Change-Id: Ic00553e5792a3687887e8253e8b2552c38448702
Reviewed-on: http://codereview.qt.nokia.com/250
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-31 09:45:09 +02:00
Thorbjørn Lindeijer
92298a5c43 DeclarativeObserver: Don't fade in the highlight edge
It feels more responsive when the highlight is immediately visible.

Change-Id: Ie3dd0693ecc38f33b001c86970b220b45b37fdfc
Reviewed-by: Kai Koehne
(cherry picked from Qt 4.8 commit 0b4e028ec294992df01430bdf978982835c7df5c)
Reviewed-on: http://codereview.qt.nokia.com/248
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-31 09:44:33 +02:00
Thorbjørn Lindeijer
335f6ad0f7 QmlJSInspector: Renamed Observer to Inspector
Manually redid Qt 4.8 commit 206ebd5af21d94c3f3b49d2cb645105a63e6f5fb,
to make future code synchronization easier.

In order not to have to change the QmlApplicationViewer again, a
compatibility class QDeclarativeViewObserver is retained that subclasses
QDeclarativeViewInspector.

Change-Id: Ief87ae2f8f76b1db0c9d65085e4832424b277603
Reviewed-on: http://codereview.qt.nokia.com/242
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-31 09:44:09 +02:00
hjk
f897108198 debugger: fix partial display of children in locals and watchers
Change-Id: I4edc6875f3d24a75dd5554a01ae01946e5c9ae76
Reviewed-on: http://codereview.qt.nokia.com/209
Reviewed-by: hjk <qthjk@ovi.com>
2011-05-30 12:57:03 +02:00
Christian Kamm
715cee76a9 qmldump: Bump to QtQuick.tooling 1.1, make parser more permissive.
The qmltypes file reader now ignores unknown bindings and components
to allow for better forward-compatibility.

Change-Id: I2e31c17344dc8fdcd301a62c8d08e98c29ef53ee
Reviewed-on: http://codereview.qt.nokia.com/202
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-30 11:26:54 +02:00
Christian Kamm
3adc021f4b QmlJS: Update qml-builtin-types for Qt 4.7.4.
Change-Id: I595c1962a71ea5b110e9050f04d1dede3c50fd0b
Reviewed-on: http://codereview.qt.nokia.com/201
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-05-30 09:31:44 +02:00
Christian Kamm
6e32742400 qmldump: Add dumping of 'revision' for Qt >= 4.7.4.
Change-Id: Ib86c771be9540e22b48685eacd29d81056b53588
Reviewed-on: http://codereview.qt.nokia.com/199
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-05-30 09:28:42 +02:00