Commit Graph

5173 Commits

Author SHA1 Message Date
Marco Bubke
7976456002 QmlDesigner: Add content item hack
There is no stand content item interface, so try to work around to enable
snapping and anchoring.

Change-Id: Ib2eaf0d6c35e3ba289dd7d55b2ba4c064ad40748
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-22 14:45:43 +02:00
hjk
288d239656 Debugger: Handle LLDB differences between Linux and Mac
Change-Id: Ie97c628ece272249c23aab6d5438555c051f5aa7
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-22 14:25:37 +02:00
Sergey Belyashov
b9ff6e65cf Russian translation update
Change-Id: I4ab239307f0c164f27fdb5e1234a9bb55c8ef7ca
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-05-22 09:55:32 +02:00
hjk
780c8283e9 Debugger: Adjust QList dumpers to LLDB needs
Change-Id: I01071510d422176b632bcaf93e009ad5056ea777
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-22 09:24:18 +02:00
hjk
a5e0ab136e Debugger: avoid using sys.maxsize, Mac doesn't like it
Change-Id: Ie58d19d24a80b71527bb5381bb3cc33475f1f8cb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-22 09:23:52 +02:00
hjk
736d32ba8a Debugger: Add autoderef to LLDB
Change-Id: Ie0f5c10f1a8eb7af531a850051c773ab3993d52e
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-22 08:05:49 +02:00
hjk
9db98dc54e Debugger: Move some common code back to qttypes.py
Change-Id: I2306277ec39d6149c376bde584c51551a780877d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-22 08:05:20 +02:00
Marco Bubke
4f28228293 QmlDesigner: Fix anchoring for application window
We don't tested that target anchor object are node instances. Now we
search for the parent object recursively.

Change-Id: I2e03e714f858a285309b02f5e88c757f0dcfe7e5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-21 17:13:48 +02:00
Marco Bubke
5847268778 QmlDesigner: Fix value change notification
The return value is always -1.

Change-Id: I19ede339e7557a794069b4dc991cb9f9a711caa9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-21 14:41:04 +02:00
Marco Bubke
f68bd231c8 Revert "QmlDesigner: Remove NodeInstancesSignalSpy"
This is fixing some anchor movement bugs.

This reverts commit ae409f8bdf.

Change-Id: Ibe9b8b2601e2bcd1c249b5feda06fb3a29482f4b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-21 13:08:10 +02:00
Orgad Shaneh
782c8a2142 Git: Provide highlighter for interactive rebase
Inspired by Vim highlighting

Change-Id: I1c967d22d26f313b5b7d37634713071d621f6f46
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-17 17:59:26 +02:00
Aurindam Jana
3f39943a37 CustomWizard: Add a placeholder field for QLineEdit
The XML file now has a placeholdertext attribute that sets
the place holder text for the corrsponding QLineEdit.

Change-Id: I537721a5e5be796f4f88054751e66e557e718948
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-17 16:16:38 +02:00
hjk
fcb419c510 Debugger: Make reference types visible with LLDB
Change-Id: I0caf56da8bc542f8829f21e703a6f4beb7d0b88d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-17 16:08:11 +02:00
hjk
85957bc53e Debugger: Clean up std::{w,}string dumper
Change-Id: I224c0d02ebca40d394e2588465877f894ca9ded9
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-17 16:07:47 +02:00
Orgad Shaneh
b1d7d806c0 Fix some compiler warnings
* Unused variables in release build
* Comparison of bool to int

Change-Id: I1ac9b1051b26ae0655d4ff6b92d216926a4785da
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-17 08:13:18 +02:00
hjk
51593a1229 Debugger: Make dumper tests startable with LLDB
Change-Id: Iaf6cf18c47b21cf196b641c44fc2475d4f382ba2
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-16 17:50:30 +02:00
hjk
1fb090e426 Debugger: Don't hard code LLDB path on Linux
Change-Id: I7454f710d6ba57e9f6929cbdcfcbf269cf1f43c0
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-16 15:11:55 +02:00
hjk
df22d163fb Debugger: Use backend-agnostic readRawMemory
Change-Id: Iacc95753b85f87b7ece903d9c5b89570714d0d17
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-15 16:30:16 +02:00
hjk
1bbca3069c Debugger: Make readRawMemory uniformly accessible from Dumper object
Change-Id: I404753691943005984fe36978a14f7dadfc8ac26
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-15 16:27:05 +02:00
hjk
c60b19394b Debugger: Merge dumper.py into gbridge.py
Change-Id: I73975bbab25fed0fed426a057a5fbd482dd3670a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-15 16:14:55 +02:00
hjk
ee716248b5 Debugger: Make std::string dumper work with LLDB
Change-Id: Id4d6e5819e3e64cea0a730f3e488e4640134848e
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-15 16:14:27 +02:00
hjk
e5855becbb Debugger: Replace std::string::_Rep lookup with hardcoded value
LLDB crashes on it...

Change-Id: Icd4f0ac2b6297c490fa17dc9bb90012326e25e26
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-15 16:13:55 +02:00
Oswald Buddenhagen
6fb94a7b10 Merge branch '2.7'
Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
2013-05-15 10:21:47 +02:00
Oswald Buddenhagen
a4e593c910 make phony_target hack work on mac even with qt 5.1
Change-Id: I4198b090840d287c0f8f1655447cdfaa98992c17
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-05-14 19:16:22 +02:00
hjk
7fd586d791 Debugger: Avoid Linux/LLDB crash when looking up "void"
Change-Id: Idd719906263e6bb72b0d72308ed37c34c657c876
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-14 19:05:15 +02:00
Leena Miettinen
d07d683691 UI text: make descriptive text shorter.
Fix capitalization.

Change-Id: I89c216e07f42c359cd11207d1702efc612db79bd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-14 15:45:17 +02:00
hjk
8053debad6 Debugger: Make our std::vector and QList dumper work with LLDB
Change-Id: If6e182c32874f7a5234bede59eb8d7dd3ab7f711
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-14 12:37:32 +02:00
hjk
c8ee3c3998 Debugger: Make some LLDB "visualizers" accessible
Change-Id: Ie1397fb8342e8cb54bc4042d94a2f2d6d1af4def
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-13 16:10:27 +02:00
hjk
6d75336da1 Debugger: Make QByteArray dumper work with LLDB
Change-Id: Iee52c6086f9c39cbfe1f20c87ebd40f5bed244f2
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-13 08:04:07 +02:00
hjk
6c8c99d20f Debugger: Make QVector dumper work with LLDB
Change-Id: I0c4d3f30060f63409af2893ced98099d50200eee
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-13 08:03:58 +02:00
hjk
99e40d5522 Debugger: Enable value priorities in LLDB interface
Change-Id: I1e96dcd0f498354d927875aaca99720ed4d3ddda
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-13 08:03:44 +02:00
J-P Nurmi
4dd4bff886 Add missing QtQuick.Controls/Dialogs/Layouts type descriptions
Task-number: QTBUG-31012
Change-Id: Ic19cc79faaa71a09724445cf961ec16cf16fcbb4
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2013-05-08 15:54:39 +02:00
hjk
6bf2cd3673 Debugger: Display QStrings with LLDB
Change-Id: I238f0203b618adb117f336dfc9f1465606f26ced
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-07 17:00:23 +02:00
hjk
1fc2c5a2bd Debugger: Remove use of Python 'cmd' module for LLDB interface
Not really needed extra level of indirection.

Change-Id: I4556cc67ec177d08943bb206b385b285f745b5cd
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-07 13:28:51 +02:00
hjk
532dc1aa03 Debugger: Add symbol listing to LLDB frontend
Change-Id: I10f22f54334c21fc48e634530ec79f9cc8ab56f4
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-07 11:41:19 +02:00
hjk
3f0c873796 Debugger: Streamline LLDB input
All options are passed as python hash now.

Change-Id: I1caa049a0f5d49ece4b65e5f560b30a2443070a5
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-07 10:50:23 +02:00
hjk
5b99f0cb24 Debugger: Implement reading of memory for LLDB frontend
Change-Id: I7f4e19913405f03fe61b75173e0014399e4fbe86
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-07 10:49:53 +02:00
Marco Bubke
3d1102081b QmlDesigner: Fix recursive dirty test
Change-Id: I62cb968eb21bb8399cd1918d68e405c9abe5d6e0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-06 14:28:01 +02:00
Thomas Hartmann
1aeffb6bb4 Wizards: QtQuick 2.1 import for Controls
Since Controls depend on Qt 5.1 we can use
a QtQuick 2.1 import.

Task-number: QTBUG-31011

Change-Id: I7524c54c3b77ccce89cc57292825f02e163fd7aa
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
2013-05-06 14:27:14 +02:00
Thomas Hartmann
f91b4de655 QmlDesigner.PropertyEditor: also support .svg for Image
Change-Id: If43e4661881f99d6a6f692981f19a61ac2c0e500
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2013-05-06 13:56:48 +02:00
Thomas Hartmann
d4b4353a78 QmlDesigner.qml2puppet: Adding simple test
This test will fail and give an error message, if
inbuild item are missing.

Change-Id: Ib7a33e7d1fbd22f76c8ac31e1dbc68912aa8edaa
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-06 12:54:40 +02:00
hjk
e7ba815c02 Debugger: Fix display of frame addresses with LLDB
Change-Id: I097af582a476abb57104d6687eb7f0036cbe64a7
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-06 09:07:35 +02:00
hjk
bfa85a509d Debugger: Add basic diassembly display to LLDB engine
Change-Id: Id65f983ffada2f8d08929a82c96767d8471d9444
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-03 17:33:35 +02:00
hjk
bd75748ce5 Debugger: Reduce timeout of LLDB stdin input
Snappier, but close to a busy loop now...

Change-Id: If4e31d35928c95fae29b3d221c5ff443386b933b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-03 17:33:21 +02:00
Eike Ziller
a2171c2d82 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp

Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
2013-05-03 09:49:28 +02:00
Thomas Hartmann
e0f50c0468 Wizards: Adding simple wizard for QtQuick.Controls
Change-Id: I80746a3e77f94040a407ce25cec9ad6fac8b6fce
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-05-02 17:14:26 +02:00
hjk
038f3c0c49 Debugger: Work around missing features in LLDB-167.2 on Mac
Change-Id: I357afd09e56f6be74187d2a5a647681dad698f98
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-02 16:32:58 +02:00
hjk
98653aa8fd Debugger: Add LLDB event handling for mixed debugger and user events
Change-Id: I357afd09e56f6be74187d2a5a647681dad698f99
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-02 16:13:11 +02:00
Kai Koehne
369351cbf2 Make sure QtQuick2 plugin is installed into right directory
Task-number: QTCREATORBUG-9229

Change-Id: I0ec3fef8cdc795f041c7ec39c1fd6b68a138046f
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Michael Brasser <michael.brasser@live.com>
2013-04-30 16:39:41 +02:00
Thomas Hartmann
22f63eddb7 WelcomPage: fix video description
Task-number: QTCREATORBUG-9087

Change-Id: I80866ace00f940000407cc25cecaad6fac8b6eee
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-30 16:08:33 +02:00