Commit Graph

4946 Commits

Author SHA1 Message Date
Eike Ziller
d918a32090 debugger: fix QHashNode dumper and QHashNode type check for Qt4
The previous workaround for the Qt 4 optimized int,uint,short,ushort
QHashNode wasn't working for the QHashNode dumper itself because of
unknown key type. Instead we first try to find the 'key' child directly,
if that fails we look for it in the second child (which would be the
anonymous union from the optimized hash node, which contains the key).

Also fix the expected type for QHashNode in the optimized case for Qt4

Change-Id: Ib48c2c0afec081ff38cd750c3d515a5e678e9661
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-29 12:40:46 +01:00
Eike Ziller
bc16e88288 dumpers: share the code for extractTemplateArgument
Change-Id: Ic1b03d2dffdfb7ba6ead191601127b54af38b3cd
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-29 12:25:26 +01:00
Eike Ziller
7ba935c44b debugger: Fix QDir dumper for Qt4 64bit
Also make the structure more self-explained

Change-Id: Ia5080f4e07e2a8b7c6b18e1353a4cf1cf3488361
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-28 16:41:10 +01:00
Eike Ziller
48007785b0 debugger: Fix Qt4 QFile dumper
Change-Id: Ifd2caaef4d0c286f2855175acb2dc1b835213c37
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-28 16:40:50 +01:00
Christian Stenger
c726f3c47e Dumpers: Fix standard types (C++11) for old gcc
Change-Id: Ic208a45f6d0c7419d83dccd78b552c734421c953
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-28 16:37:10 +01:00
Eike Ziller
a3c4fe1ff2 dumpers: Fix QHash<int,...> dumper for Qt4
In Qt4 (u)int hashs are optimized and the key is inside an
anonymous union, so, at least with LLDB, we cannot reference
"key" directly as a child of the QHashNode

Change-Id: Id7cac3d08fa85af599f2b2564a6b1f11b465c7b2
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-28 12:50:55 +01:00
Christian Stenger
1ca3da6117 Dumpers: Fix dumper for QVariant holding QList for old GDB
Change-Id: Id34806f06546ad9a6618f9b9431143465a988c1d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-28 12:50:32 +01:00
Eike Ziller
c6faedf1c7 debugger: generalize is32bit() through ptrSize()
That also makes lldb dumper actually test for bitness instead of
assuming 64bit

Change-Id: I6207bac04817e1f4700247dc00d2dfdace1e5100
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-28 11:27:47 +01:00
hjk
0190eb59f9 Debugger: Show shadowed variables with LLDB
Change-Id: If93547396384fe5b421c4b601b52476a23cdfa89
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-25 16:12:03 +02:00
jkobus
deeeda162d Remove unneeded space
Change-Id: I7e7335bd8b3ef2816abe07a3c5dc6cf2b86afc3b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-10-25 14:23:34 +02:00
Friedemann Kleint
357ea64797 Message fixes in QML-Designer.
Change-Id: I309b3b74b0760b8b1a89c0f85ffb52cc875e5d85
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-10-25 08:23:25 +02:00
hjk
7f5366796c Debugger: Fix display of vector extensions with LLDB
Like char __attribute__ ((vector_size (8))) ...

Change-Id: Ie93547396384fe5b421c4b601b52476a23cdfa89
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-24 18:49:27 +02:00
hjk
ab92c14bbe Debugger: Fix std::complex dumper for LLDB
Change-Id: I5ffb0f60039bb05f8467e925e71cf710a0712791
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-24 18:19:54 +02:00
hjk
6c673a042f Debugger: Fix std::deque dumper with LLDB
Change-Id: Idd3547396384fe5b421c4b601b52476a23cdfa89
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-24 17:40:22 +02:00
Eike Ziller
9a57a41a7a Fix QDateTime dumper with various Qt versions and bitness
Change-Id: Iba15c1b27dc83e8949fef5fd25de61cc2b20be30
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-24 17:14:54 +02:00
Kai Koehne
9b88e0db32 Update file/directory names for Qt Quick 1 template
Make the names in line with the Qt Quick 2 ones. Also, changing
the directory/filename makes sure the update mechanism of Qt Creator
doesn't update apps generated by the 2.x wizard any more, which
might break stuff.

Change-Id: I4621d5f35eae2102aeba7e77c5cd903511be249f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-10-24 16:58:23 +02:00
hjk
0b8f3c3e9d Debugger: Continue LLDB event loop after exceptions
Change-Id: I4d3547396384fe5b421c4b601b52476a23cdfa89
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-24 15:29:44 +02:00
hjk
6d4cc2231a Debugger: Handle _Rb_tree_const_iterator, too
Change-Id: I01baa597976ec5f6e84c8c52aff6e617082b1a28
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-24 15:25:40 +02:00
hjk
cd3c084df3 Debugger: Improve QSharedPointer dumper
Make it work with LLDB, show simple values always directly.

Change-Id: I463ef81183792f85243d679dee69a41db00bed07
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-24 15:16:05 +02:00
Thomas Hartmann
9351b1ce35 QmlDesigner.PropertyEditor: adjustment to layout of ItemPane
* Adding some space above the TabWidget
* Avoiding double black lines at the top

Change-Id: I0aedf151b548a665445d4219609738b2ab23c0be
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-24 14:21:57 +02:00
Thomas Hartmann
0cdb0724c2 QmlDesiger.PropertyEditor: adjust background color
Change-Id: I403c37f2cda84980dfe441746f3c5bed7258a4ca
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-24 14:21:16 +02:00
Thomas Hartmann
cc18936d17 QmlDesigner: adjustment of Section(View)
Adjusting the item library and property editor,
so they follow the same style for sections.

Change-Id: I79d3560acff3b126056cf55b81fd21a531f9594c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-24 14:20:56 +02:00
Thomas Hartmann
4cd8f0b3e2 QmlDesigner.PropertyEditor: adjust TabView style
Styling the TabView in css is problematic and we want to keep
the style in sync. So we use the old style here.

Change-Id: I57ed39a03b4b4c59e9a996ca4e14d4d9fe9dfeb2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-24 14:20:46 +02:00
Thomas Hartmann
e7418a9c95 QmlDesigner.PropertyEditor: some adjustment to ComboBox style
Change-Id: I52a80941e343ad9ad3cca7bc0bcdec8fe0a90156
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-24 14:20:36 +02:00
hjk
71080c8b8a Debugger: Fix std::map::iterator dumper for LLDB
"Better" spaces in type names again...

Change-Id: I21aafa021fd4893fb521251c9b4b9572c2beef44
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-24 12:46:27 +02:00
hjk
fc4a953bb5 Debugger: Simplify LLDB communication protocol
Produce proper JSON directly.

Change-Id: I61aaba021fd4893fb521251c9b4b9572c2beef44
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-24 12:26:17 +02:00
hjk
46c1769e24 Debugger: Show at least size for std::__1::unordered_map
Change-Id: I51aaba021fd4893fb521251c9b4b9572c2beef44
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-24 12:24:44 +02:00
hjk
1daac29647 Debugger: More QRegion dumper fixes
Change-Id: I01aaba021fd4893fb521251c9b4b9572c2beef44
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-24 11:37:50 +02:00
Marco Bubke
a2c0b91ec5 QmlDesigner: Disable componentComplete for primitive creation
Control are now in a qrc file and the component are registered as Qml
types. We are using the primitive creation path in this case so we have
to disable the componentComplete call.

Change-Id: I52936b92d936acbfc21ba800ffca9123fcece864
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-24 09:48:04 +02:00
hjk
b889bb1608 Debugger: Make QRegion dumper more independent of debuginfo
Change-Id: I332e17cd4c6a167d273f31f4e7ff63c149a5d34b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-23 19:27:33 +02:00
hjk
c60cc101dd Debugger: More robust type lookup in QHashIterator dumper
LLDB needs exact matches of spaces

Change-Id: I442e17cd4c6a167d273f31f4e7ff63c149a5d34b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-23 19:27:25 +02:00
Thomas Hartmann
f2634b316a QmlDesigner.PropertyEditor: fix property name in LayoutSection
Change-Id: I3ca4d1930a90c9d84019061f32a8d34d646fce98
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 18:01:25 +02:00
hjk
0614587ebf Debugger: Use more robust way to look up QMapNode types
LLDB needs exactly the same spacing as in the debug info.

Change-Id: I8a2e17cd4c6a167d273f31f4e7ff63c149a5d34b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-23 17:52:15 +02:00
Thomas Hartmann
120d56c116 QmlDesigner.PropertyEditor: bringing back the templates
Template for auto generates pages now work with in Qt Quick 2.

Change-Id: Idd0a8fe8d82555bc69b192b21df7641dcdb634b4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 17:45:31 +02:00
Thomas Hartmann
c0cae37d6a QmlDesigner.PropertyEditor: fixing color editing
Change-Id: I3102799952bace9c052f70f52489f5d768621f25
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 17:44:53 +02:00
Thomas Hartmann
f06d1ae0bf QmlDesigner.PropertyEditor: cleanup of unused code
Change-Id: Ia62b8cc0889ed6ccb83cada5718b75c5205fa2a6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 17:44:43 +02:00
Thomas Hartmann
e4f4042bd6 QmlDesigner.PropertyEditor: fix names of margin properties
Change-Id: I284b1ec1269afa38f62a3f9b2747440ce4eedc36
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 17:44:34 +02:00
Christian Kandeler
bdc26d9379 Do not set the QT_CREATOR macro for the QML puppet.
It's not Qt Creator. And otherwise the build breaks with a namespaced
Qt.

Change-Id: Ib30ef86fbc59a02f6fd60d2f0b0b8f4ab452ef6d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 16:55:37 +02:00
hjk
e94e403052 Debugger: Fix QList<QStringList> dumper for LLDB
QStringList is movable in Qt 5

Change-Id: I5b0bee9c55e54f62c93a8515af0f56cdafed78bf
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-23 16:34:09 +02:00
hjk
04eaf6cdfc Debugger: Make function pointers visible with LLDB
Change-Id: I230bee9c55e54f62c93a8515af0f56cdafed78bf
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-23 15:21:18 +02:00
Thomas Hartmann
60710f6c05 QmlDesigner.PropertyEditor: moving the color logic into component
Change-Id: I3d90618f5826cf77cc9813fd3b31fbfdbd5b50e7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 14:38:29 +02:00
Thomas Hartmann
8b2682b257 QmlDesigner.PropertyEditor: fixing step size for opacity
Change-Id: I461baba451c0aed3c34ec581bccce82f954df511
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 14:38:20 +02:00
Thomas Hartmann
ea6c6ccbe1 QmlDesigner.PropertyEditor: avoiding text eliding in LayoutSection
Change-Id: I5635e2a304f7ad3c66d6eb17d2318af0dbd19037
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 13:43:02 +02:00
Thomas Hartmann
e21d11371c QmlDesigner.PropertyEditor: polishing TextEditSpecfics
* adding TextInputSection
* moving StandardTextSection to the top
* adding ComboBox for Format

Change-Id: I730bee9c55e54f62c93a8515af0f56cdafed78bf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 13:42:52 +02:00
Thomas Hartmann
c22e28e0e4 QmlDesigner.PropertyEditor: polish TextSpecifics
* moving StandardTextSection to the top

Change-Id: I58f6e148389f5e073bb40c177bbf238931cf47e9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 13:42:43 +02:00
Thomas Hartmann
c76e4e4234 QmlDesigner.PropertyEditor: polish TextInputSpecifics
* adding TextInputSection
* moving StandardTextSection to the front

Change-Id: Ic6eb7aecefa63c1e7c6f003b5b8ae900291aaee1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 13:40:33 +02:00
Thomas Hartmann
b80b806ac9 QmlDesigner.PropertyEditor: fixing layout in ItemPane
Change-Id: I44e9f35bfa592c015f3a089ace82c64995d89748
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 13:40:23 +02:00
Thomas Hartmann
77095bfc9e QmlDesigner.PropertyEditor: fixing layout of GeometrySection
Change-Id: Ic89df790be9c30cb84ce4d2ecaa7ebe5d322c9b8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 13:40:14 +02:00
Thomas Hartmann
c932d99470 QmlDesigner.PropertyEditor: adding TextInputSection
Change-Id: Iee3416c098608de5a76b1ef017a95efb7077c2bf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 13:40:05 +02:00
Thomas Hartmann
922286bf1a QmlDesigner.PropertyEditor: fixing LayoutSection
Change-Id: I8c8bcee36b2e2ee1d2e32535da135ac5182459a5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 13:39:57 +02:00