Commit Graph

130 Commits

Author SHA1 Message Date
Christiaan Janssen
ba9c802e1e QmlProfiler: manage receiving trace after app stopped
Change-Id: I97409748ebac3ee8af3690f2d84d3038638a3419
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-09 11:19:46 +02:00
hjk
cad2966498 use Core::Id for IMode::id and IMode::type
Change-Id: Ic7ce5b883e054c6eeba078327042e99e1c556345
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-08 10:18:12 +02:00
Christiaan Janssen
2afa559c2a QmlProfiler: show binding types
Change-Id: Iea469aa3e0fb7c4e5146163f049c930df6fc2b7d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-04 15:09:18 +02:00
Kai Koehne
4d3395b990 QmlDebug: Rename library and (most) classes
Rename the QmlJSDebugClient lib to QmlDebug (shorter names, easier differentiation with the shared/qmljsdebug lib).

Also rename
 - QDeclarativeDebug* classes to QmlDebug*
 - QDeclarativeOutputParser class to QmlOutputParser

To clarify the features,
 - Debugger::QmlDebuggerClient is now Debugger::BaseQmlDebuggerClient
 - QmlEngineDebugClient is now BaseEngineDebugClient
 - QmlDebuggerClient is now QmlEngineDebugClient
 - QDeclarativeEngineDebugClient is now DeclarativeEngineDebugClient

Change-Id: Ie15713730a614c8ab4b637fad0924f95b54e633f
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-04-18 14:31:36 +02:00
Tobias Hunger
5a01a0c157 Add SymbianIDevice
Change-Id: I0332e6a5e8db6e25a87804c647e920cab537eafe
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-04-17 12:35:37 +02:00
Christiaan Janssen
6ff4a0b586 QmlProfiler: flush on new trace
Discard pending data if a new trace arrives while an old one
was still being processed.  If we don't, the data of both
traces gets mixed, leading to a possible crash.

Change-Id: Ibba7df06f6a4b7e93d00f6fa1fa4802baf3a1731
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-26 16:46:41 +02:00
Christiaan Janssen
b7304e2f2e QmlProfiler: Refactor
The code of the qmlprofiler client has become a bit too complex,
this patch reorganizes the modules in a more sensible way,
having the modules communicate with each other through a
state machine instead of the excess of signals and slots
from before.

Change-Id: I76f7313779888a1bd07a1cdb1acbf2e47aacf42a
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-14 11:38:25 +01:00
Eike Ziller
4b8df15f3d Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/plugins/remotelinux/startgdbserverdialog.cpp

Change-Id: I69597e20d5372e9baf12ac09fc20d39406683f9e
2012-03-08 07:48:55 +01:00
Daniel Teske
5585426efc Ui: No spaces before "..."
Change-Id: Ic76ef1bea53e2cf5c2d109688247e84c1aa70f6b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-03-07 16:14:55 +01:00
Kai Koehne
3f00faa9ef QmlProfiler: Always use quint16 for port number
Change-Id: Ie77227058637c4900248eaca0ea183ad46b82663
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-03-01 15:08:40 +01:00
Kai Koehne
c90cca7904 QmlProfiler: Don't print assert when trying to connect a second time
This can happen when e.g. the first attempt failed because of an
unavailable port.

Change-Id: I7e61c6f6d0a65c48c1b7031be95bdabd965fe5ab
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-02-29 16:36:40 +01:00
hjk
503c6e2684 projectexplorer: Make the debugger language chooser a (hardcoded) "aspect"
This is the first step of a larger refactoring. The plan is to make
debuggersettings more orthogonal to individual runconfiguration
implementation. This patch alone already pushes the settings handling
to the debugger plugin and removes code duplication in the
runconfiguration implementation.

Change-Id: I4c78d1658ea462d3df14b873f8f41cc918a23f1a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-21 12:21:38 +01:00
Christiaan Janssen
1322a73efd QmlProfiler: read trace when application ended by the user
This patch avoids showing the "use the stop button" if the
application dies but the trace data was sent in time.

Note: with the current implementation in Qt5, the application
sometimes closes before all data could be sent.  That happens
with any non-trivial qml application.

Change-Id: Ie7b1568b2d69320d1887587dccac40a4b4d4d788
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-02-17 17:25:00 +01:00
Christiaan Janssen
1fca414997 QmlProfiler: cleaning events pane when stopping from server
Change-Id: I0e215b16d1a07124579a8ae593c13c8571d24ab8
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-02-17 17:24:40 +01:00
Christiaan Janssen
585e651310 QmlProfiler: manage server-side start tracing message
also
QmlProfiler: refactor eventlist state

If unexpected data is received, assuming server stopped profiling.
Also, introducing a eventlist state instead of relying on
signals sent around.  This is part of a coming bigger patch
where the profiler client is refactored.

Change-Id: Ibed9007903956daf03cc0fcb90f77b5ad2d3cf90
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-02-17 17:22:23 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
Christiaan Janssen
eca36a23d1 QmlProfiler: hiding extra statistics by default
User can choose to see them through the context menu.

Change-Id: Ibf1670098126658af497c7a87b46c26f6dd2d41e
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-02-07 10:38:11 +01:00
hjk
2df4cb21fe Core::ModeManager: make some functions static
Change-Id: I5c1275ba3f596d8911fd2e4404181bf57b58f494
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-27 14:52:24 +01:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
hjk
4a21f0c3c8 Use new static ICore interface.
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-24 18:48:47 +01:00
Christiaan Janssen
1958fd82d5 QmlProfiler: reading column information in bindings
Change-Id: I1a99c3508de733d98eb99f41419eccfdca030fe0
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-01-20 12:18:50 +01:00
hjk
a6ff74c0d8 ProjectExplorer: use enum instead of QString for run mode
Change-Id: Ia906944a489b09afdea59f74afbf759b4caebe37
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-11 13:52:26 +01:00
Nicolas Arnaud-Cormos
4a8432112a Analyzer: create a run control factory for all tools.
Having one factory per tool (or plugin) created some bugs:
 * analyzer project settings being created twice
 * per-project analyzer settings widget duplicated
Also, most of the code from the run control factory were copied.

Now, the Analyzer only creates one run control factory shared among all tools, and the IAnalyzerTool
has two new virtual method: canRun and createStartParameters. It simplify the code a bit, and
creating a new analyzer tool is easier (only two classes to subclass: IAnalyzerTool and IAnalyzerEngine).

Change-Id: I4e180846a26b74b2b77cb99bc97534d680a80a4d
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-28 18:25:56 +01:00
Christiaan Janssen
eef3d91ea1 QmlProfiler: linking JS events with QML events
Change-Id: Id2f37caef0c62fa8fa830fed8f46dcbb0a565cdb
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-12-14 16:49:36 +01:00
Christiaan Janssen
7daa3095ce QmlProfiler: fix double-load problem caused by 25d351fa
Change-Id: Ib60cb122188e286c596e0595e38bf2814db6d487
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-12-08 17:49:46 +01:00
Christiaan Janssen
72c06cb6fd QmlProfiler: timers for all profiler activities
Change-Id: I2ecbf4d1d90e353506e7c164560b69b81fcc6c66
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-12-07 10:46:01 +01:00
Aurindam Jana
9e0cae5dac QmlProfilerTool: Use complete signature in connect()
Change-Id: If6cfec0f836cf1ca31a194461e55e2fdd04b2250
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-11-25 16:54:01 +01:00
Aurindam Jana
25d351fa0a QMLProfiler: Menu entries to load/save QML trace
Added 'QML Profiler Options' menu to 'Analyze' menu to
load and save QML traces.

Change-Id: I468fbcfdf355a1caaa0d53b118f0b8b505cedefb
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-11-17 13:53:57 +01:00
hjk
8e236db9f5 mostly core and analyzer: more id-fication
Change-Id: Ic794fdc6a582f4a03d84b6220c59111044c753b9
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-15 18:25:19 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
2011-11-11 09:46:25 +01:00
Christiaan Janssen
efa7e7a43a QmlProfiler: changed labels in context menu for statistics
Change-Id: I125016944130c7171423e2dec80b2b03832cd282
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-11-10 11:39:49 +01:00
Christiaan Janssen
d09b3b903d QmlProfiler: link selections in events and timeline views
Change-Id: I1fb511fdb77e7c74f66624fcc88c2e0ce9adb457
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-11-10 11:03:43 +01:00
Christiaan Janssen
c4694275fb QmlProfiler: option to get statistics from local region
Change-Id: Id11cce971b081d67052dd8e7c74f51e2e25a8fd8
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-11-10 10:21:44 +01:00
Christiaan Janssen
ab7b749be1 QmlProfiler: manage external tracefiles nicely
When inspecting a trace from an external project
where the source files are not available
avoid displaying error messages continuously

Change-Id: I4dad291092130b0132a338740a54c506edd67161
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-11-09 15:56:11 +01:00
Christiaan Janssen
135c449c4b QmlProfiler: merging Callers, Callees and Events
Change-Id: I9e50710a8ddf91e143110cd8bc43a528aa4ee863
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-11-09 15:13:08 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
Christiaan Janssen
70b01ced49 QmlProfiler: optimizations in canvas repaint
Change-Id: I866f8941129c5a42256f40dca4e4c4fe15b5a760
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-11-02 12:18:43 +01:00
Christiaan Janssen
3a4710e780 QmlProfiler: updated zoom controls
Change-Id: I3e09e0879a44f1dbf03f3989267aaf79c959526f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-11-01 17:01:55 +01:00
Christiaan Janssen
1e505b6563 QmlProfiler: fix crash with context menu when nothing is selected
Change-Id: I8e5e47e1fcc620c823e7d3e1c5a643fb09d4b392
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-11-01 16:44:54 +01:00
Kai Koehne
bab2cb5f8b QmlProfiler: Try to locate files in loaded projects first
Similar to the debugger, the qml profiler should take all loaded
projects into account.

Change-Id: I37ce855a95f6f415a5d7a8d1d362c15a1dd698db
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-10-31 17:03:45 +01:00
Eike Ziller
81cce8902e Merge remote-tracking branch 'origin/2.4'
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljscheck.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
2011-10-28 10:17:44 +02:00
Daniel Teske
2fa0b073f6 Initialize pointers, fix correct gcc 4.6 warning
Change-Id: I53a63013e8c440bacd21bacb8afecd9f055cbce4
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-10-19 17:34:03 +02:00
Kai Koehne
a0e0a125c9 QmlProfiler: Also store sysroot in settings
Change-Id: I323798b47d5f7fcdf8ad70ee3def89814a6522e9
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-10-18 11:34:59 +02:00
Eike Ziller
1868dd94f0 Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: Ie1ecdbaefb9cabebd90bc7c0f8837cc31dbac5af
2011-10-17 16:44:41 +02:00
Kai Koehne
655e6faae8 QmlProfiler: Keep configuration of attach dialog
Change-Id: If9f4918a77c874c82fec63eacf1464b78b5d82ac
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-10-17 15:05:19 +02:00
Kai Koehne
f925ecb30f QmlProfiler: Add "Sysroot" field to attach dialog
Change-Id: Id3c6a0eaa90096f2a7a0bdcfac10644e10e8858c
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-10-17 15:05:02 +02:00
Christiaan Janssen
1fff13f04f QmlProfiler: fix tracefile extension
Change-Id: If19f71b81bd5a4e9f7e02ae79033c4b46a34739f
Reviewed-on: http://codereview.qt-project.org/6326
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-10-10 16:14:13 +02:00
Christiaan Janssen
a26259997c QmlProfiler: V8 profiling
Change-Id: I926c5821d31453064f5dbed2b5a10f6195761f42
Reviewed-on: http://codereview.qt-project.org/5892
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-10-07 17:19:50 +02:00
Kai Koehne
d23a1adc3c QmlProfiler: Show 'retry' message box when connect fails
Show the same message box as in the debugger if connecting to
the port fails.

Change-Id: I5f101fa6e7fc6166ad37c88d046aafca24a4276f
Reviewed-on: http://codereview.qt-project.org/4891
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2011-09-20 16:13:42 +02:00
Kai Koehne
6b1f96bf7b QmlProfiler: Re-enable attaching to a (remote) port
Change-Id: Iff5f8cf26e580ede4f82aba5a36acd785521da8d
Reviewed-on: http://codereview.qt-project.org/4890
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-09-15 13:35:34 +02:00