| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
|
|
|
|
|
| |
Change-Id: I551d2b65bbd1734847b7e995e0f95e906d116497
Reviewed-by: hjk <hjk121@nokiamail.com>
|
|
|
|
|
|
|
| |
Targeting re-use for tooltips, and potentially sorting.
Change-Id: I1ce8f4da73ab5ca13cd70d7c651bc76c67f91a39
Reviewed-by: hjk <hjk121@nokiamail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
"state" is the more widely used term and we should follow that
convention. We also need to distinguish between the state of the
underlying network socket and the client itself. The change makes this
explicit.
As preparation for the upcoming centralized debug support the "State"
enum of the debug client is also moved into the QmlDebugClient class.
Change-Id: Ib9d7e03d23528f16ed696ed3518e813d11ea1c32
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
| |
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTCREATORBUG-10689
Change-Id: Iebce5596ff1cd71a1cd35e57ec302a6343134245
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
|
|
|
|
|
|
|
| |
They are a hassle for translators and reviewers alike.
Change-Id: I363138212b692cf75fe1605df8af3721315d37e1
Reviewed-by: hjk <hjk121@nokiamail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A lot of our build system files specify unneeded include
paths. These roughly fall into the following categories:
a) Paths that are already set in more general files
such as qtcreator.pri.
b) Paths that serve no purpose at all, possibly
left over from earlier versions of the project.
c) Paths that act as workarounds for wrong include
statements of the form '#include "xyz.h"', where
xyz.h is not in the same directory as the including
file.
This patch removes such path specifications and fixes the offending
include statements from case c).
Tested on Linux, Windows and OSX with qmake and qbs.
Change-Id: I039a8449f8a65df0d616b4c08081145c18ae4b15
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
|
| |
| |
| |
| |
| |
| | |
Task-number: QTCREATORBUG-9230
Change-Id: I24a6277c9ca5f35c803e276da82ca2b9e9d79f57
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTCREATORBUG-9069
Change-Id: If0fa1824c9f4b09d9ea4f1c470fdeb18c2836b36
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Forward-declare QGraphicsOpacityEffect in DetailsButton,
QProcessEnvironment in Environment, QFileInfo in fileutils,
QUrl in IWelcomePage, FancyLineEdit in PathChooser and
remove unneeded headers.
Change-Id: I7d5f273530dd2059bbdaf0899f0a3bc7e49e8482
Reviewed-by: hjk <hjk121@nokiamail.com>
|
|/
|
|
|
| |
Change-Id: I1c78f5f5a7174002cd25bea109d5fe795530cdb5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
src/plugins/debugger/qtmessageloghandler.cpp
src/plugins/debugger/qtmessagelogwindow.cpp
src/plugins/madde/maemodeployconfigurationwidget.cpp
src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
src/plugins/qmldesigner/designercore/include/widgetqueryview.h
src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
src/plugins/qnx/bardescriptormagicmatcher.h
src/plugins/qt4projectmanager/profilekeywords.cpp
src/plugins/remotelinux/deployablefilesperprofile.cpp
src/plugins/remotelinux/deployablefilesperprofile.h
src/plugins/remotelinux/deploymentinfo.cpp
src/plugins/remotelinux/deploymentsettingsassistant.cpp
src/plugins/remotelinux/profilesupdatedialog.cpp
tests/auto/icheckbuild/ichecklib.cpp
tests/auto/icheckbuild/parsemanager.cpp
tests/auto/icheckbuild/parsemanager.h
Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
|
| |
| |
| |
| |
| | |
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/coreplugin/editormanager/openeditorsview.cpp
src/plugins/debugger/qml/qmlengine.cpp
src/plugins/debugger/qml/qmlinspectoradapter.cpp
src/plugins/qtsupport/exampleslistmodel.cpp
src/plugins/qtsupport/exampleslistmodel.h
src/plugins/welcome/welcomeplugin.cpp
Change-Id: I92b542af23ceb7cf7dac84b12439e5f819f2dc39
|
| |
| |
| |
| |
| |
| |
| |
| | |
Update context from QML object tree or the stack frame
depending upon debugger engine state.
Change-Id: I4e6affba37acc016513ad95cd278a400aaa18c49
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
share/share.qbs
src/plugins/cpptools/cppchecksymbols.cpp
src/plugins/texteditor/behaviorsettingswidget.cpp
Change-Id: Ia34060984f9c036b2f28a6411d796d41f55a3e37
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When an object is selected in the Inspector, the
Editor is updated to show the relevant code.
Task-number: QTCREATORBUG-8246
Change-Id: I4f7fbcccdeb22849682fa72c63e87a78f48d185b
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
|
|/
|
|
|
|
|
| |
Only comments were adapted
Change-Id: Id1393d512ed950ca747267c1e024d54e3bfc279d
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
|
|
|
|
|
| |
QML objects are fetched lazily when constructing the object tree.
Incase parents have not been previously fetched, we fetch the
required data to construct only the relevant branch of the tree.
Task-number: QTCREATORBUG-8246
Change-Id: Id529c3b2334d33ff4eb46b14f50cf042ad2960e2
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
| |
Change-Id: I188c41a5335ff626cce519a0622e2201197df0fa
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The watchhandler needs to be reset for locals before
inserting the values of a new frame. Also the DebuggerTooltipManager
needs to be notified. The values of the locals in the
LocalsAndExpressions window should be editable.
Task-number: QTCREATORBUG-7992
Change-Id: I556e23b408db09b510f1f2bc350ff55187ec87c2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
|
|
|
|
|
| |
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: If052b4a018d5d0c20086a0251d7d1b206e7d4192
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Fetch data on demand for 4.x. Since, parentIds are not
known, the tree will be reset when new objects are created.
Related changes in Qt side:
https://codereview.qt-project.org/#change,35982
Task-number: QTCREATORBUG-7779
Change-Id: I8b53604979bbbc2e6f01bc7b785929811a76f398
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
|
|
|
|
|
|
|
|
| |
A client for DeclarativeDebugger Service. The service is
a backport of QmlDebugger service.
Change-Id: I868a286756c2d6bcbb2f41904a13d7f691e9704c
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
|
|
|
|
|
| |
Change-Id: I7a974072096689aaa4b1ec1cca93dcd9febe14d9
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
|
|
|
|
|
|
|
|
| |
Fix gdmi escape routine by using a traits class to adapt
QByteArray/QString.
Change-Id: Ic6d2a0c927e4613aec9f69095bbb04a393e9edb9
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
|
|
|
| |
- Compile with QT_NO_CAST_FROM_ASCII.
- Remove single character string constants.
Change-Id: Icece98619b6c30e047d3fce00e6ae74bbcd53c67
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
| |
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
| |
done to correct the regression introduced in
2574a5846983a3016e551432d24f8d8d4e3b97b5
Change-Id: I0d9fb8fabcd134f53f1a1c9d0fa04ca7b542a88c
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Adding the objects to be watched corrected in case new objects
were created.
Task-number: QTCREATORBUG-7529
Change-Id: Ica5f852f47882242a0e97692c97c0ca4ee662a4e
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
|
|
|
|
|
|
|
|
| |
newObjectsCreated reset while clearing the object tree.
Task-number: QTCREATORBUG-7519
Change-Id: Ie5ee9bfd0faafb60f968a0c219b372eea6679761
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
|
|
|
|
|
|
|
|
| |
When an object is created, the properties are fetched and added
to the object tree only if the parent Iname is known.
Change-Id: Id49a1873e9ffaf33689fe11297341cf56472c1be
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
QtCreator takes into account the result of message from
qtdeclarative for setting, resetting and updating the method
body.
Task-number: QTCREATORBUG-3264
Change-Id: I15d1a33990175e86bb3f2fee08f75dd5b7b1b628
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Correction done for the bug introduced with
commit fc1f265e874c1c2ba6828885dbd12339b2165650.
Task-number: QTCREATORBUG-7498
Change-Id: I322a564208d70c7778a208fe0d9360ce47b75b81
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
|
|
|
|
|
| |
Change-Id: I6d094605e3983128b844f2156909b98a4016509f
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
|
|
|
| |
Populating watchhandler can be expensive. Update
with just the necessary data.
Change-Id: I06c28e1c8f5437cc05d3f9cef139d3df9da10c81
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
As Location information is already cached, there is no
need to fetch the information from the QmlJS Semantic info.
Task-number: QTCREATORBUG-7409
Change-Id: I9cc3dce0910632cfe517f7697d74691e6675793b
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Response for "destroyObject" now has the debugId of the
destroyed object. This is used to fetch the parent object rather
than querying the engine context.
Change-Id: I2e5b7650cbe847117cce6952206dd479ee696f0e
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
QML property values could be set in the inspector.
Regression introduced by 7f09d0b756ff3f9bb52737d4aaf65ed84d751316.
This patch is a partial fix. Only values can be assigned currently.
For expressions, use the console.
Change-Id: I945b11109cd7788dd0f5277af206bf9658844aee
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
|
|
|
| |
Try to use the watchHandler for referring to the object tree
instead of caching the object tree locally.
Change-Id: I68624771ef49d50f2cf0d6d580b1b34d57483178
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
It's one model for all locals, watch, return, tooltip and inspector
data. This allows more streamlined code paths and better isolation
of the model data from the WatchHandler. WatchItems are now registered
in a hash indexed by iname, so inames can be used as the primary
handle to watch data in the WatchHandler interface.
Change-Id: Idac0a808b5d785307496d1de4198a1f2e9ce3880
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
|
|
|
|
|
|
|
| |
Send the engineid, objectid and parentid.
Change-Id: I7b340c1f20ba3eb3f1690d45b28819f6efaae013
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
|
|
|
|
|
| |
Change-Id: I9407b7617c6e74ab71a72360a72b5f6d1e334ee7
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
|
|
|
|
|
| |
Change-Id: I1871f4c0d4ccb7339f4cea64e6119e0a74459630
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Since the object tree is fetched lazily, we might have
objects whose debugIds are not known. In such cases,
objects can be fetched by passing the location info.
Change-Id: I2001460cc14401e011efef9be9194c9f7868d617
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
|
|
|
|
|
| |
Change-Id: I2c55e5a4c95088c1a1944916678483792ffaba95
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Move Status enum out of QmlDebugClient and drop "QmlDebug"
prefix for the different 'Reference' structs. Allows to
avoid 'using namespace in QmlDebug' in header files.
Change-Id: Id9857977300e86d637cf128ff3417d8b24c8e995
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
|