Commit Graph

5173 Commits

Author SHA1 Message Date
Thomas Hartmann
2130c49102 QmlDesigner.PropertyEditor: allow translation of all strings
This patches adds the tr checkboxes to all string in the
generated property  sheets.

Task-number: QTCREATORBUG-9184

Change-Id: I4a3ff8120d7ccd5a6b9e11d212f955cd66ba01aa
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-30 15:15:02 +02:00
Thomas Hartmann
bdeb9371ee QmlDesigner.Instances: The engine does set the QObject parent first
We should follow the engine and set the QObject parent first.
Actually some items (e.g. menus) do not like it differently.

A note: The engine seems to always set the QObject parent even for items.

Change-Id: I700e8802300b8eee093f73ea11e07c4cdb0338aa
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-30 13:11:18 +02:00
Thomas Hartmann
7a5836d257 QmlDesigner.Instances: emit component complete signal for 5.1
Emitting the Component.onComplete signal.

This is only available in Qt 5.1

Change-Id: I77503333296cccd9999d2610cca126530f777777
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-30 13:11:05 +02:00
Thomas Hartmann
9763e9e325 QmlDesigner.Instances: always set the QObject parent.
We follow the QmlEngine/VME and always set the QObject
parent before reparenting into list properties.

Also we set the QObject parent for all objects.

See qqmlvme.cpp line 622
QQml_setParent_noEvent(o, parent);

Change-Id: If889e6cc07e99ea443b80de13c4be9dce6c2ceee
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-30 13:08:22 +02:00
hjk
8d4289bb9c Debugger: Re-organize communication with LLDB
Change-Id: I2916a2e4a180506f01dda237fd356e9a35119117
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-30 11:54:00 +02:00
Eike Ziller
bedc477943 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
2013-04-30 11:43:33 +02:00
Fawzi Mohamed
eac15b5e7d qmljs: add explicit -relocatable flag to qmlplugindumper and use it
This will allow changing the default to nonrelocatable.

Change-Id: I80746a3e70f94040a407cc25cec9ad6fac8b6fec
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-04-25 17:21:45 +02:00
Kai Koehne
a6cd9abcd1 QmlDesigner: Fix gcc compilation warnings
Fix warnings from gcc 4.8.

Change-Id: If4fc311ea021d1014141cb123f1d765577efd831
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-25 12:52:12 +02:00
Marco Bubke
893020ae5d QmlDesigner: We should test if untracked items are dirty too
Change-Id: I94db08fff3e7e38a9cc377d06a5aabc6d886b64e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-24 17:46:01 +02:00
Marco Bubke
cec82a13e1 QmlDesigner: Fix clipping render bug
Clipping is happen over the bounding rectangle, so should provide the
clipped bounding rectangle.

Change-Id: I602da312a7ca327def378a887a75782c61cc680d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-24 17:45:52 +02:00
Marco Bubke
ea5169a163 QmlDesigner: Improve naming of variables
Change-Id: I8429517b81308f4a6a15b90a1ac7486de49562d9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-24 17:45:44 +02:00
Marco Bubke
a58810ce9e QmlDesigner: Do componentComplete for QObjects with QmlParserStatus
Change-Id: If7ea6c55f4540a8bde113076288c0e9c6dd1210f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-24 12:45:35 +02:00
hjk
ff6296f3cb Debugger: Improve internal dumpers for GdbMi and BreakpointId
Change-Id: I26d20a1e592254c09e865528b2fa31cc20bcae54
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-23 17:31:33 +02:00
hjk
2cb48a1431 Debugger: List installed dumpers properly in LLDB bridge
Change-Id: Id38cf5e8664b7584886d14be9a090bc7b7172410
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-23 17:31:21 +02:00
Eike Ziller
38b61177f6 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	tests/auto/treeviewfind/treeviewfind.pro

Change-Id: I1ec788373656c947b50d72df6c26c91312469692
2013-04-23 11:13:25 +02:00
Tobias Nätterlund
874328fe9b QNX: Corrected path to qml files for pure QNX devices
For pure QNX (non-BlackBerry) devices, the path to the QML
files are decided by the user. Only adjust the path for BlackBerry
devices.

Change-Id: I909ed0a06bc6985a5a353aab61bda395afcfb7aa
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
2013-04-23 10:38:19 +02:00
Tobias Nätterlund
53fb29bdda QtQuick2ApplicationViewer: properly resolve install paths
This is a port of commit 2982545d to also apply it to
the qtquick2applicationviewer.cpp template.

Change-Id: Ia9d964d9fc98ea957c52aea783c6148449552755
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-23 09:19:46 +02:00
Thomas Hartmann
fd9d39c12a QmlDesigner.Instances: properly disable component complete for 5.1
This is only available in Qt 5.1

Change-Id: I76b7916b4ce64c440c175e77edc2b0a3ef015166
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-22 18:19:24 +02:00
Marco Bubke
457566974d QmlDesigner.Instances: adding LayoutNodeInstance
This class wraps a QQuickLayout.

Change-Id: Ib661ccb5bb5deb1acb87b9a4bef8da95cb4e40eb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-22 17:39:04 +02:00
Marco Bubke
ff4457bb46 QmlDesigner: Prepare for other layout items
Change-Id: I831e68877eb3d785b4bbb99db002ab8e42158d75
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-22 17:03:37 +02:00
Marco Bubke
40b62e1cfa QmlDesigner: Add GraphicalNodeInstance as abstraction for item and window
Change-Id: Icaba711464f672a3bfbb9d83a449d47e72ba11ff
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-22 17:03:23 +02:00
Eike Ziller
e3fd25256d Qbs build files: Install files to correct location
First step in fixing the Mac build

Change-Id: I86659b9b46c01fc17fd93b8ffc3b378d2b580c36
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-04-22 16:58:09 +02:00
Thomas Hartmann
7076272bf5 QmlDesigner.Instances: fix delemiting of type names
Import are delemited with a "." and there is a "/" between
import and type.

e.g.: QtQuick.Layout/QQuickLayout

Change-Id: I7750b333296cceef99992610cca126530f777777
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-22 13:21:32 +02:00
Marco Bubke
06cfc22fe2 QmlDesigner: Remove old function
Change-Id: I065a6febd74e13740117e0a5223fa71648a7c430
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-22 11:23:27 +02:00
hjk
aacd884287 Debugger: Mac/LLDB run fix
"settings set interpreter.prompt-on-quit off" does not
exist on Mac

Change-Id: Ib4575be58a669193813036c4c8f4f48cc3d358e8
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-19 14:12:29 +02:00
Eike Ziller
0d5c886af3 Adapt the Qt Creator plugin project template to recent changes
Change-Id: Id5cc8642547a3698d2e11b956f0c1cfe3e8bea1e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-19 13:30:04 +02:00
Oswald Buddenhagen
d77883c16a Merge remote-tracking branch 'origin/2.7' 2013-04-18 15:18:34 +02:00
Marco Bubke
2557e0f39d QmlDesigner: Remove override from non virtual function
Change-Id: I8d0b782df5e0819d7f20c2294aa4be9b017a6cb9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-18 13:59:22 +02:00
Eike Ziller
55de6a9fb9 Merge remote-tracking branch 'origin/2.7' into HEAD
Conflicts:
	src/plugins/coreplugin/generalsettings.cpp

Change-Id: Ic92d637fb92748b2bb40e1a2895ea5d0644b4646
2013-04-18 12:54:37 +02:00
Thomas Hartmann
58e280de2c QmlDesigner:Instances: Adding instance for QQuickWindow
This allows QuickWindowNodeInstance to return the content item
instead.

The function parentObject() in ObjectNodeInstance now knows
QQuickRootItem, because the parent of the root item should
is the windows (which is just a QObject but treated as item from us).

Change-Id: Ibaa7ccc8dd9346689cc4443ce0b594056feaa0cf
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-18 12:20:41 +02:00
Eike Ziller
44931c0985 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/pythoneditor/tools/lexical/pythonformattoken.h

Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0
2013-04-18 09:22:19 +02:00
Thomas Hartmann
e311761b57 Fix compilation for Mac OS X
CONFIG += c++11
does not work with clang atm.

Change-Id: I7750b333296ccedf999d2610cca126530f737777
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-17 11:23:33 +02:00
Marco Bubke
ea8c98c2d8 QmlDesigner: Remove stupid code
Change-Id: Ie56c5e26a7ec077b794a4993679ab80a716740ce
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-16 16:52:26 +02:00
Marco Bubke
2b698e31ed QmlDesigner: Add override to qml2puppet
Change-Id: Ibdf07c4a35b40f3fc78300a1675270f8295bec42
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-16 16:52:20 +02:00
Marco Bubke
e13e6550f5 QmlDesigner: qml2puppet is using c++ support
Change-Id: Ie6ac96b713775db13a02cecdc74849ad97f017e5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-16 16:52:15 +02:00
Marco Bubke
de822ec5ca QmlDesigner: Remove old paint function in instances
Change-Id: I5da0c624b467448dc6f16a88fa3ad3682f423c20
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-16 16:52:11 +02:00
Marco Bubke
e7206d5b04 QmlDesigner: Fix reparent function in qmlpuppet
Change-Id: I7f30f23c5f2af24f3715bae2b1f4b7be044b0da7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-16 16:52:06 +02:00
Marco Bubke
5d3c1a2a2b QmlDesigner: Remove old functions in instances
Change-Id: If886ca208de775472c4e97e986c2f4df81615959
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-16 16:52:00 +02:00
Marco Bubke
0de9237699 QmlDesigner: Add PropertyName usage in instances
Change-Id: Ia7eb8730c61347833c70a3d62787c10e2a3134ca
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-16 16:51:54 +02:00
Fawzi Mohamed
a019c4c7a1 qmljs: update qt-creator builtins.qmltypes, and use them for qt<-4.8.5
qmlplugindump of qt <= 4.8.5 does not output exportMetaObjectRevisions
so do not use its output for the builtins.

Task-number: QTCREATORBUG-9076
Change-Id: I82bdd325ef15f800c70c830ead4867787f6b7b0a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-04-16 09:57:32 +02:00
Friedemann Kleint
a0696ada0d Fix texts in QtQuick-Extension plugins.
The text needs to be one line for the translation transformation
to work.

Change-Id: Ia1c4ab02a0774bebbc6b0f59f2a9682d0a751e6a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-04-16 09:28:04 +02:00
Marco Bubke
359ef53280 QmlDesigner: Move implementation code in the node instances
updateDirtyNodeRecursive and renderPreviewImage belongs to quick image and
not in the node instance server.

Change-Id: I629b89c748036c0614e78bcfa0c837cb16ca6374
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-15 13:53:53 +02:00
hjk
2e9b8406da Debugger: Claim a few more capabilities for LLDB engine
This will need further fine tuning.

Change-Id: Ia8926a73adfdf3de313cd379c4d6452b0af56ca0
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-12 17:46:23 +02:00
hjk
2efdca1e12 Debugger: Use 'thread step-out' instead of LLDB function call
Seems not to be implemented or working on LLDB/Linux right now

Change-Id: I04a98d038eb2d7a7a5fbe1d713351d392aff8047
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-12 15:29:11 +02:00
hjk
4269ce4e38 Debugger: Progress on LLDB state handling
Change-Id: Iadf9c7026a3da0adeec8340729a303bbbee57c24
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-12 14:56:48 +02:00
Eike Ziller
e3fde349ad Merge branch 'master' of ssh://codereview.qt-project.org:29418/qt-creator/qt-creator 2013-04-11 18:28:07 +02:00
Eike Ziller
9ff8979da3 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/cpptools/cppchecksymbols.h
	src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp

Change-Id: I887ba071fa637ad44e39bcae581738fa078a6612
2013-04-11 18:27:52 +02:00
hjk
5b98167ebd Debugger: Remove common bridge.py
The engines know what they want, no need to guess again.

Change-Id: Ie21b0e08eff8b81b217a08d4c47c35c35ae831d7
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-11 18:17:21 +02:00
hjk
4284693cd2 Debugger: Fix regression introduced in 1d580bcf9f
Change-Id: Ia4a88aaae1e3b3e1a9c7ec3cd5b8a52d36edac4f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-11 18:00:51 +02:00
hjk
13090b21d1 Debugger: Simplify LLDB backend message passing
Change-Id: I3a95d6a21d1da1f0c3df743e6743d3d8e558e967
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-11 17:46:15 +02:00