Commit Graph

4257 Commits

Author SHA1 Message Date
hjk
f9a7bb7bcf Debugger: More robust Qt namespace extraction for LLDB
Change-Id: I3964f15cb4295a64f91e0eb6035d365ee2b9f9bd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-19 13:12:11 +01:00
hjk
358500e7fc Debugger: Move LLDB state reporting to separate function
Change-Id: I4e250173efc1c0df002d2ce94f7e8df57339544b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-19 13:05:38 +01:00
hjk
05d7dd1bb9 Debugger: Synchronize LLDB bridge output
Output coming from spontaneous events should not interfere
with output produces by lengthy display generation.

Change-Id: I2a9e4fa93db131cfdac4cb0eb613c0159214d8be
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-19 12:57:07 +01:00
Oswald Buddenhagen
868428cc63 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qbs/imports/QtcTool.qbs
	src/plugins/git/giteditor.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
2014-03-18 14:46:29 +01:00
Thomas Hartmann
81b84af431 Welcomepage: session list should not be flickable
Change-Id: I663c6634960ac7704648f8fd01d85b349a0ef19d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-18 12:08:53 +01:00
hjk
5d1bc3859d Debugger: Add simple QV4::String dumper
Change-Id: Ide277128d30c4dcc5c396441ebd6e40aa3fc8b51
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-03-18 10:32:31 +01:00
Thomas Hartmann
df4a28dd40 QmlDesigner.PropertyEdior: Fixing ComboBox
If there is no enum value fall back to the instanced value.

Change-Id: Idd4654d6e9fb8d4afd3df0855861511bc06454c1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-17 17:38:59 +01:00
Thomas Hartmann
af906188cd QmlDesigner.PropertyEditor: Fix OriginControl
The control has to use the new enum api.

Change-Id: I73e86ac1c4f2c3fe4373b12968ac86fbbaee64aa
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-17 17:38:55 +01:00
Thomas Hartmann
ff5c964457 QmlDesigner.PropertyEditor: Fix text alignment buttons
They have to use the new enum api.

Change-Id: Ib4ac7d56512007cb19fd7e6a65413198a9d90719
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-17 17:38:44 +01:00
Thomas Hartmann
8d563e7b8d QmlDesigner: Revert bumping the puppet version
Since Qt Creator 3.1 will be released before Qt 5.3,
bumping the version number and enforcing to rebuild the puppet
creates a huge hurdle for end users.

Change-Id: Ic85a2ed315cf67b7d47bdfa492e6c5d2adf719d9
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-17 15:23:20 +01:00
Thomas Hartmann
de7d2d7aa3 QmlDesigner: Hotfix for older puppets
Older puppets crashes if we send enumerations so we convert them before.
This patch has to be reverted in master.

Change-Id: Id33e776616ea6e74c7b14799e3aed130c39f8fed
Hotfix: 3.1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-17 15:23:13 +01:00
Kai Koehne
e2ac45bf7e Remove script-private dependency from qml2puppet
Change-Id: If040844310105970f645f413cfc005abdb95994c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-17 13:09:12 +01:00
hjk
1910fe9175 Debugger: Add dumper for boost::container::list
Change-Id: I251a859ca63bf932cb0d22ef11b5492b75ebcadd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-14 16:17:29 +01:00
Christian Stenger
6f2c3d9cb3 LLDB: Stop creating zombies when executing dumper auto tests
Change-Id: I8a9d2e9e0027f60a9801ba9a20aab1c5e2991bdb
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-14 13:00:55 +01:00
Alessandro Portale
1b50faef8f WelcomeScreen: Adding links to Qt Account and Qt Cloud Services
Change-Id: Iec39fd4a44671c284e7442f40a1c3156a299437e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-14 11:50:17 +01:00
Alessandro Portale
1dfa2da87c WelcomeScreen: putting the "icon plus link" into a component
...more links to come...

Change-Id: Ic500f38995bf515eda80c0720d1fdd7718e5ff54
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-14 11:50:08 +01:00
Kai Koehne
41b57bfd0e Remove Qt 4 fallback for examples browser
Remove fallback file, and rather use the examples-manifest.xml,
demos-manifest.xml files that are part of Qt 4.8.0 or newer.

Change-Id: I6291bd01b75b891a5ddab7fb01cdfc29ed8bec34
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-13 14:19:29 +01:00
Thomas Hartmann
402ea02821 QmlDesigner: Bump version of QmlPuppet
Change-Id: I1e791e8d39e48408239e1ba980ff0751fe8278dd
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-03-13 11:26:19 +01:00
hjk
906b813640 Debugger: Simplify LLDB Qt namespace and version extraction
Change-Id: I00b0e32da56bef613220d98f9d99758b47b3daf5
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-12 18:05:52 +01:00
Thomas Hartmann
503f013632 QmlDesigner.PropertyEditor: expose ColorLogic
Change-Id: Ibc15d3b05c518dcf71a0b2c014b3076f42e71cdf
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-12 16:29:59 +01:00
Marco Bubke
f01fe61fa4 QmlDesigner: Hotfix for all Windows
Now all windows are exchanged with items.

Change-Id: Ieecd4410c92a1e4f63b1035843a8534e92199b98
Hotfix: 3.1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-12 16:14:39 +01:00
hjk
0abf12ae32 Debugger: Fix base type extraction with LLDB
Change-Id: I0370040879abf948be8594dec4bf267978329bbb
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-12 15:11:32 +01:00
hjk
af43f684bd Debugger: Consolidate metaObject recognition
Same code can be used for LLDB and GDB...

Change-Id: I07aae10fec28f01425cc13285504f57aef3afd25
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-12 14:31:36 +01:00
Thomas Hartmann
541b5141f2 QmlDesigner: Bump version of qml2puppet for Qt Creator 3.1
Change-Id: I57aae18fec28f01425cc13285504f57aef3afd25
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-03-12 11:21:43 +01:00
Marco Bubke
065253a259 QmlDesigner: Ugly hack for the Window bug
Window is not working so we exchange it with an item. We need a better
approach for it in the next release. Revert this patch in master.

Hotfix: 3.1

Task-number: QTCREATORBUG-11601
Change-Id: I047dd558f8813cc8b3b6c8bad3394c3cf30c8d8e
Signed-off-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-12 11:20:04 +01:00
hjk
8303f793ab Debugger: Force plain transport for non-ASCII char data
Task-number: QTCREATORBUG-11670
Change-Id: Iec5d3c7e73139414c51216ed6767c4524e859329
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-03-12 10:28:54 +01:00
hjk
72d1998824 Debugger: Implement "Create Full Backtrace" for LLDB
Task-number: QTCREATORBUG-11642
Change-Id: I92d7cde1e5021ab06ad72a00645184c41dae0e6b
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-11 16:56:23 +01:00
hjk
4202b94dbf Debugger: Let creator trigger the locals update also with LLDB
Makes the code path more similar to the GDB side and allows
skipping register refreshs when the view is invisible.

Change-Id: Ia9210ee1709dbc5c9c7a6870bf8a54484261fee0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-11 16:29:28 +01:00
hjk
b76fb6baba Debugger: Comment out unused threadname code
This should be re-vived at some time for MinGW, until then making
clear that it is not used does not hurt.

Change-Id: I365c9fb1f859223da2f96b72a33419313438d83b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-03-11 14:44:25 +01:00
Joerg Bornemann
84df758ec6 use new base import style in qbs files
Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-03-11 14:20:22 +01:00
Oswald Buddenhagen
52bf71fbdf Merge remote-tracking branch 'origin/3.1'
Conflicts:
	README
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: Ib9aef37a246bc3bb9bca0c32a902af3b09ef3146
2014-03-11 13:39:55 +01:00
Christian Stenger
660014f098 Debugger: Fix typo
Change-Id: Iba23331b4a6a17c690a6c630e1fbb29d530cfb30
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-11 13:21:47 +01:00
Christian Stenger
f8afa89ba7 Tests: Fix QThread dumper for old gdb (~7.4)
Change-Id: Ifbaf8f326744e9e271b407d8650ffcc47b890889
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-10 17:57:09 +01:00
Orgad Shaneh
5bb72be900 Debugger: Print traceback on dumper exception
Change-Id: I652d31b111eab464bf3301968fe273d24f0dad11
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-10 10:05:02 +01:00
hjk
3a988262de Debugger: Speed up Qt version extraction
Change-Id: I20494f4cae410d430049b3a5e4ce397ac3917ddb
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-07 18:56:21 +01:00
hjk
dbc474ef71 Debugger: Speed up Qt namespace extraction with GDB
Change-Id: Ic2a1296828d5aceb6c0aae0edbd165e3d0e86741
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-07 17:59:18 +01:00
hjk
6975be4f54 Debugger: Don't memoize guessed Qt versions too quickly
There might be better data after more shared objects are loaded.

Change-Id: Ib81226b4cafe0d067d62087e320413f8d070bee8
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-07 14:24:49 +01:00
hjk
b7ebfd274f Debugger: Move some common bridge code to dumper base
Change-Id: I9fd988c84bff5e02bc45478994f27a7bddb3358b
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-07 13:14:13 +01:00
hjk
8931a14afe Debugger: Select topmost frame with usable data also with LLDB
Task-number: QTCREATORBUG-11597
Change-Id: I5d95c9172e90b82f5671427283cf46e924456c4c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-07 12:49:31 +01:00
hjk
64fabd7b6a Debugger: Adjust QFileInfo dumper to offset test findings
Change-Id: I769be481a2c7e90bfcd6387267b2828c66a4b915
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-07 12:40:14 +01:00
Marco Bubke
0853ffadc4 Change the priority for qml wizard templates
The control templates should be come first.

Change-Id: Ieb5f0b22f47c0ec2113c4722d96e878d167c8f3e
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-06 18:58:13 +01:00
Thomas Hartmann
61c119ce7f QmlDesigner.PropertyEditor: Remove duplicate
Change-Id: Ib1fb950a6ee7c63870c1291d7fc27ec3fc7578c7
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-03-06 15:07:29 +01:00
Thomas Hartmann
7632d7a124 QmlDesigner.PropertyEditor: Add missing scope to FontSection
Change-Id: I867400a52948c1966e2b7d44eec23ec20ca38569
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-03-06 15:07:14 +01:00
Thomas Hartmann
ce136406d8 QmlDesigner.PropertyEditor: Exposing styles
This allows 3thrd parties writing their own specifics files to use
our styles.

Change-Id: Ia4996e41aec4e77b85ee731e4b4ba71101b1b82d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-03-06 15:06:12 +01:00
Thomas Hartmann
f29a4acf1f QmlDesigner.PropertyEditor: Fixing enum scopes
Change-Id: I4f8402b863f929aed90384f119e49302a89c4cd2
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-03-06 15:06:01 +01:00
hjk
1d1695c2b4 Debugger: Move breakpoint markers with LLDB
Task-number: QTCREATORBUG-11564
Change-Id: I98044c641ad68431176d8ef54e8e1ec1bef296bc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-06 10:44:20 +01:00
Thomas Hartmann
bbe35e1991 QmlDesigner.PropertyEditor: proper maximum/minimumValues
The default was 0-100. This patch allows a bigger range.

Task-number: QTCREATORBUG-11541
Change-Id: I6b5c29cef1e4706814a9b7cf2d1f2186d7e681c7
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-03-05 16:07:46 +01:00
hjk
a8a9786b91 Debugger: Add Run-in-Console for LLDB
Task-number: QTCREATORBUG-9650
Change-Id: I74586ca8c89efedbb952218497f7acdae500d3b9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-05 16:03:55 +01:00
Marco Bubke
57591442a0 Change priority of qml application templates
The Window element is not working in the qml designer. So it would would
be nice to have a default template which is actually working.

Change-Id: I7eae41d9ccc1c0cc8b65a6eed3f999e45b396291
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-05 15:29:11 +01:00
Marco Bubke
2784d750cf Make qml template more designer friendly
If you open the qml file in the designer and want to move the text item
you move the mouse area instead. I think it is not very intuitive.

Change-Id: I41457e4f42a145433189ac45768e345ac73b262e
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-05 15:28:57 +01:00