Commit Graph

3963 Commits

Author SHA1 Message Date
Eike Ziller
23ec56516e Merge remote-tracking branch 'origin/3.4'
Conflicts:
	src/plugins/coreplugin/coreplugin.cpp

Change-Id: I9aa6c61412e2ef4a91efe028296bcc2d075856d7
2015-03-11 10:35:49 +01:00
Thomas Hartmann
cf8d601b1d QmlDesigner.Instances: removing unused argument
Change-Id: Iff03a4659c02eb348d58957b2abb6676e5da8a7e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-03-10 12:04:50 +00:00
Christian Stenger
14a02d5081 Debugger: Tests: Fix execution of dumper tests on OSX
Change-Id: Ibe3e447d29e3834766ef067ba4424c3b08ba5eb1
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-10 08:55:14 +00:00
Thomas Hartmann
e8c8968ab6 QmlDesigner.QmlPuppet: Show import error messages on root item
* If an import fails we show this as an error on the root item.
* If all imports fail (including the QtQuick import) we also
  show an error message, but try to recover using QtQuick 2.0.

Change-Id: Ibfece2acdb9f2a6ba26dfd9b31607507fec82dd1
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-03-09 16:14:28 +00:00
Sergio Ahumada
2c876f7443 Update some more links to qt.io
Change-Id: I043cf78f128dc8d99e3316b951cf91d2f6d6524a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-09 14:30:39 +00:00
Orgad Shaneh
5db2af5c80 Theming: Use a dark yellow color for info bar
Change-Id: I04a06d40c8b95ff90a138e47e21ef29cbac29e9a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-09 14:22:03 +00:00
hjk
3e02f8ec2e Debugger: Fix format switching for char[]
Task-number: QTCREATORBUG-14094
Change-Id: Iea1f59d5af2fb453ead7e0cef9e04293a698794e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-09 11:17:25 +00:00
Eike Ziller
e2c073f41e Merge remote-tracking branch 'origin/3.4' 2015-03-09 10:26:39 +01:00
Orgad Shaneh
0c5dac717e Dumper: Fix literal dumping for template name
Change-Id: I41aab8da071745f8675ef9a7bcf2f6ca0f2fbd3e
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 13:30:06 +00:00
hjk
b981f5049d Debugger: Let LldbEngine pass current token to dumper
Change-Id: Ifea751354f637f67e640d36ba1baa95678c86ee9
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 08:43:37 +00:00
hjk
2fb9c3c7ab Debugger: Add dumper for (internal) ProString
Triggers currently on any class called ProString, but should (a) be
harmless, as the children are still available, and (b) can be disabled
by changing the Local Display Format for ProString to 'Raw data'

Change-Id: I59bfef50fb1b6c4aac44bf18bb1966851c19b7d0
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-05 17:37:28 +00:00
Eike Ziller
2b954973d8 Merge remote-tracking branch 'origin/3.4' 2015-03-05 13:32:28 +01:00
hjk
3ddbba1415 Debugger: Postpone location reporting in LLDB stops
... to the initial stack contents report. This helps to avoid unwanted
assembler reports in cases where we have to skip over "spurious"
stopped events.

Change-Id: I3340297ab01f976ab9d918fe73f69f4f32b12c03
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-04 13:01:06 +00:00
hjk
fb785895f2 Debugger: Make LldbEngine stack handling more similar to GdbEngine
This also addresses the remaining issues of QTCREATORBUG-13803.

Task-number: QTCREATORBUG-13803
Change-Id: Iceb123279236d98961d15fe7421acc7c10d1b1c7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-03 10:21:25 +00:00
hjk
9abfd712aa Debugger: Fix dumper reloading
Was broken after making the handler functions members.

Change-Id: If14cbad777323d48000641fb38a01eb59503d297
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-03 08:13:36 +00:00
Orgad Shaneh
4ad3a9564b Dumper: Fix dumping of nameless symbols
... like blocks

Change-Id: Ide53fd3758b09d996e4b7d7ebe91d50a8252cd27
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-03 07:20:17 +00:00
Eike Ziller
af17e1922f Merge remote-tracking branch 'origin/3.4'
Change-Id: I66ac8be7a8e99fc730131f75710bafc73809f593
2015-03-02 12:11:37 +01:00
Olivier Goffart
f9ad67c0de Add CONFIG+=c++11 in most of the templates
Change-Id: Ib3732c018283ebb7a609cd68cdc6b7880bd55f9f
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-02 11:10:26 +00:00
Orgad Shaneh
44797cdb52 Debugger: Fix stack filename resolving on Windows
Task-number: QTCREATORBUG-13999
Change-Id: Ifc04a5592b8a07c95f152e73e802b7b686119d88
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-02 07:06:12 +00:00
hjk
0ef651240d Debugger: Ignore first stop for LLDB/Terminal
Change-Id: I16c24fb4072ce4d63fdbfc57618daa2a48fa1d80
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-27 16:53:24 +00:00
hjk
2ffe50c208 Debugger: Fix stack view update after switching threads with LLDB
Change-Id: I8e870a44e07dd069db5f61ae6ffd75c517e2d445
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-27 14:52:14 +00:00
hjk
672ab5c8d8 Debugger: Rely less on implicit state in lldbbridge.
Ideally, all 'current' data should be passed down from the engine.

Change-Id: Ibfe7c466ec564c6907398ec2ec6c05d04e6670d6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-27 14:42:55 +00:00
hjk
eb44cfc00a Debugger: Fix loading of Linux core files with LLDB
Change-Id: I76183591c5242589c25d8e5695367d61b6cc5afc
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-27 12:27:20 +00:00
Thomas Hartmann
d092b0e389 QmlDesigner: Some styling adjustments
Change-Id: I24884a8d4d45c4fac83e7a1892b172bf41f6ba88
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-02-26 16:31:58 +00:00
hjk
6b0d5d6036 Debugger: Clearly mark unavailable register contents
The previous display as 0, or 0x0...0e (LLDB on Linux) was
less useful.

Change-Id: I820ea5ef427b65633471c7c62e44851fcfd637cd
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-26 13:56:51 +00:00
hjk
0697c6d89a Debugger: Fix array access with LLDB if index is a long
Triggered with the QGraphicsPolygonItem dumper on Linux.

Change-Id: I1374ca308c732eb5c25da959d8b499515ed72e66
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-26 07:48:42 +00:00
Eike Ziller
767f0ef58b Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	doc/api/coding-style.qdoc

Change-Id: Id40eb253a2e3e2357276ee76085127da10597bdb
2015-02-25 10:15:28 +01:00
Tobias Hunger
6c49356471 JsonWizard: Allow for descriptions of wizards
Allow for descriptions of project wizards that will be displayed in the
Project location page.

Task-number: QTCREATORBUG-13924
Change-Id: I7d65aba0e07f074cc0935318cff9b93f166a1c51
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-02-24 14:56:21 +00:00
hjk
c992a9ff08 Debugger: Add dumpers for QPolygon{,F} and QGraphicsPolygonItem
Change-Id: Ic246b28d44312a677c8d41194d4e0c324bda125d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-24 14:48:33 +00:00
hjk
2ee4363d1d Debugger: Force LLDB round trip between stack and locals update
The stack might produce data (such as as the QML context in
native mixed debugging) that is needed for locals display.
While this doesn't work yet with LLDB anyway, the change
suppresses one soft access when accessing the top frame of
an empty stack (the usual case on the first update).

Change-Id: If931fbe940b8cda01cc6cc34429a2fcb33cd8d19
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-24 14:31:32 +00:00
hjk
3a7a1c2164 Debugger: Make some LLDB warning not break output format
Dumper.warn() tries to interleave the message with an
ongoing report, whereas the global warn prints directly,
possibly breaking the report parsing.

Change-Id: If753773d5eedf98a489f155d46d2911e04059461
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-24 13:27:23 +00:00
hjk
4198cc1441 Debugger: Don't re-check pending LLDB breakpoints
This partially reverts change 1d1695c2.

This doesn't seem to be needed with recent versions of LLDB anymore
and removes one source of "spurious" breakpoint-changed events.

Change-Id: I8140944a46bbc83173c0088117a88110b0872e8a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-24 09:55:35 +00:00
Eike Ziller
4e53c23b4b Mime types: Fix that some QML files were opened as C++
We registered a mime type "application/x-qml" conflicting with "text/x-
qml" from freedesktop.org.xml. The magic matcher of the C++ mime types
might kick in, in that case.

Task-number: QTCREATORBUG-13994
Change-Id: I5900c233b42681d7b7d3af185d6ff3e1c4166e59
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-24 09:46:04 +00:00
Thomas Hartmann
a2aaf0f6eb Fix assert for m_objectInstanceHash
The hash was not cleaned up in any case and sometimes a new object
gets allocated at the exact same address.
To avoid leaking hashes in m_objectInstanceHash and to avoid the assert,
we remove any deleted QObject from the hash.

Change-Id: I2697ab2b2430ad47932841fb9c0ef88ffa4cbbb1
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-02-23 11:52:49 +00:00
Sergio Ahumada
e84770b794 Adapt documentation URL
Change-Id: I74963a9d4a729450341f4f7a4ae5b3583654ffb8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-02-18 12:38:23 +00:00
Tim Jenssen
f160d2b8f5 add/use error channel puppet -> designer
Change-Id: Id6988e604ca3a092564a3e572c03b322bc101b77
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-02-18 12:34:10 +00:00
Christian Kandeler
38609296d1 Find widget: Give feedback to user about whether search has succeeded.
Right now, the only way for a user to find out whether a search term was
found is to scan the editor window for marked strings, which is a drag
in the negative case. Also, an ongoing search is practically
indistinguishable from a failed one.
Therefore, color the search term red if the search has failed.

Change-Id: I57441c3804043e1dcfb33638844b4550abd5ac46
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-17 10:28:11 +00:00
Thomas Hartmann
83e128ec79 QmlDesigner.Instances: use TypeName instead of QString
A dynamicTypeName has to be always latin1 so we should use TypeName
instead of QString.

Change-Id: I06c945aa61f677788285cbc8ff8f5811f6c61b0b
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-02-16 09:43:41 +00:00
hjk
aa67078276 Debugger: Implement basic value assignment for PdbEngine
Change-Id: I505c3e9c4a239ed381d525b5acaf1acf3a06a59a
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-13 17:05:29 +00:00
hjk
055c4ecb53 Debugger: PdbEngine cleanup
Change-Id: I39f072fe819da746c624e6028b0e5e17f1f1f111
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-13 16:12:16 +00:00
hjk
5442d144b6 Debugger: Hide PdbEngine infrastructure from itself
Debuggers running inside the debugged application are weird.

Change-Id: I2452e3653221c8f585123852ea113bd2fdfd08ed
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-13 15:01:39 +00:00
hjk
d479701591 Debugger: Start moving PdbEngine to event based parsing
Change-Id: I63e06045b54226636280678ae7db8326a3e5f02e
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-13 14:51:39 +00:00
Orgad Shaneh
ed7c287f50 Theming: Add a Color value for splitter
Used BackgroundColorSelected as a workaround in 3.3 in order to
maintain BC.

Change-Id: I1520deb8adcfed26b65aa7f4612218d15c310923
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-02-13 10:25:24 +00:00
Orgad Shaneh
e717a75e38 Theming: Sort Color enum values
Change-Id: I2c234e2217ab1aa5e150e6fb721818b6ed9d22a9
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-13 10:25:19 +00:00
hjk
a081fee8f5 Debugger: Cleanup lldbbridge.py
Move reusable Breakpoint enum to base, use 'theDumper' uniformly
across backends as name for the Dumper singleton. Signal
engine setup only if the Dumper successfully initializes.

Change-Id: If1b6be9d054f249d0d46061e4949cbecf4fd09cb
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-13 09:55:35 +00:00
hjk
a7fce39103 Debugger: Start moving PdbEngine to common Gdb/Lldb base architecture
That's still not meant for "production", but just the "3rd use case
needed to get abstractions right".

For testing, remove all build steps, and use a custom run step
with executable /usr/bin/python and argument pointing to the
main .py file.

Change-Id: I6ae6ed08597896ea979ee58e73c546c7892e8be2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-13 08:54:14 +00:00
Eike Ziller
56aadc407d Merge remote-tracking branch 'origin/3.3'
Conflicts:
	src/plugins/debugger/watchhandler.cpp
	src/plugins/projectexplorer/kitmodel.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/shared/qbs

Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602
2015-02-12 17:36:29 +01:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
2015-02-12 17:29:21 +01:00
hjk
f91cc66f9a Debugger: Combine some watch related GDB and LLDB code paths
Change-Id: I20e5f6f04418c931354a07bc3597f6982fcaf942
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-12 12:49:21 +00:00
hjk
9df463da84 Debugger: Convert bb extension to use runCommand
Change-Id: I528c51d2b02dccd91429778ef8c940fe5565345f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-12 10:27:33 +00:00