feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
23,333 Commits 108 Branches 368 Tags
d207165f6aa89ee95bd41c41a49d68cfa0b46444
Commit Graph

62 Commits

Author SHA1 Message Date
Kai Koehne
742019e301 Debugger: Fix QML-only debugging on Harmattan 
Actually wait for the 'Waiting for debugger on port ' ... message
to appear in the application output before connecting, and also
use the port specified there.

Change-Id: Ib498e5306bc49f2f3d468353b1c5d1ea38a809e6
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2012-02-23 15:46:46 +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
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
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
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
Eike Ziller
fbd47e25ee Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	share/qtcreator/templates/qtquickapp/main.cpp
	src/plugins/analyzerbase/analyzermanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: I3be78f22e7301d61a9c7fc142cbc34a3cebc2cf4
 2011-11-18 10:16:49 +01:00
Daniel Teske
3e305f9758 AnalyzerManager: Fix analyzer actions disabled after build error 
Change-Id: I7a6d29aba5acd2eafccf8b2c2fc08cc4ed6f00f3
Task-Nr: QTCREATORBUG-6318
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-15 12:56:22 +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
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
Kai Koehne
8f7411fdad Unify parsing of application output in Debugger and Profiler 
Change-Id: I8711f39aa44fea7d1a7091a27d77f5e73d5e4291
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-11-01 17:04:15 +01: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
Kai Koehne
f1f1136259 QmlProfiler: Stop app if you cannot connect 
No reason to let the app running when we've already told the
user that we cannot connect.

Change-Id: I35cd7ec2523af07cb2256aa96d5f3ebb96752ac2
Reviewed-on: http://codereview.qt.nokia.com/3661
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-08-26 12:49:02 +02:00
Christiaan Janssen
9fa409cbd9 QmlProfiler: manage quick stops before connection 
Task-number: QTCREATORBUG-5804
Change-Id: I86e9a94c5352d0ac8f9157949afd3b32d60cb05e
Reviewed-on: http://codereview.qt.nokia.com/3606
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-08-25 17:01:17 +02:00
Kai Koehne
e7be96f683 QmlProfiler: Fix documentation link for setting up debugging 
Link directly to the page where the setup is described (qml profiler
page just links to it).

Change-Id: Ibe88f1b2269c90e868aab5272b01e337956d8e46
Reviewed-on: http://codereview.qt.nokia.com/2510
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-08-02 13:33:35 +02:00
Kai Koehne
7aaab4d050 QmlDbg: Don't wait infinitely for messages on application output 
We only connect to the port when we get a 'Waiting for connection ...'
message on application output. This was done mainly to avoid lots
of failed connects, and therefore an unresponsive UI on Windows.

However, the application output might be redirected for various reasons.
Therefore fall back to busy connect after a certain time (4 seconds
for profiling, 8 seconds for debugging).

Change-Id: Ie1b943f678ced40c030cc134493a2adf7e3bc9df
Reviewed-on: http://codereview.qt.nokia.com/2323
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-07-29 16:32:02 +02:00
Kai Koehne
1757228278 New QTC_CHECK warning replacing QTC_ASSERT(x, /**/) 
Warn if the condition fails, but otherwise don't change the execution
flow.

Change-Id: Id7b14c745109b66960add967b2a4ef8d31e1a546
Reviewed-on: http://codereview.qt.nokia.com/2389
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-29 12:19:11 +02:00
Christiaan Janssen
b421f3eca7 QmlProfiler: managing failed starts gracefully 
Change-Id: Ice0debcb6b83977b8f50dd154687e7c5c6abac7b
Reviewed-on: http://codereview.qt.nokia.com/2113
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-07-25 16:41:56 +02:00
Christiaan Janssen
11f749663c QmlProfiler: supporting Application Output Pane buttons 
Task-Numbers: QTCREATORBUG-5548 5549 5550 5551 5552

Change-Id: I39a18e05967cf50eab2725cb65e6291d66c8af55
Reviewed-on: http://codereview.qt.nokia.com/2112
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-07-25 15:52:53 +02:00
Christiaan Janssen
02120e45e7 QmlProfiler: refactored warning messagebox 
Change-Id: I41e361fc2dc1cab0f103eccbb15b9c38cc78cb77
Reviewed-on: http://codereview.qt.nokia.com/2041
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-07-22 15:59:36 +02:00
Christiaan Janssen
678e6b1e2c QmlProfiler: show warning when no executable given 
Task-number: QTCREATORBUG-5266
Change-Id: If1639e322f4ab0d7065e3394129c6649f17e98c9
Reviewed-on: http://codereview.qt.nokia.com/2039
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-07-22 15:37:40 +02:00
Christiaan Janssen
409ed3b275 QmlProfiler: show warning when no observer is present 
Task-number: QTCREATORBUG-5536
Change-Id: I2cd1e62f78af3b1b18a3e318ad29ee0343c48b29
Reviewed-on: http://codereview.qt.nokia.com/1930
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-07-21 10:54:27 +02:00
Eike Ziller
07098221e5 Open a sensible help page when project misses setup for profiling. 
Change-Id: If5ceb841ac8f49ac7dd74f0e2f6ed31a44489115
Reviewed-on: http://codereview.qt.nokia.com/1534
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-07-14 10:56:59 +02:00
Christiaan Janssen
82ff204314 QmlProfiler: display warning when app killed 
Change-Id: I2183e02a5ce4b266702d0771933bda61efa66e95
Reviewed-on: http://codereview.qt.nokia.com/1603
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-07-13 16:07:56 +02:00
Thomas Murach
a4c4d67772 corrected license headers 
Change-Id: I56fa50745a80abf52488bebe6a5a72cf26932a8b
Merge-request: 352
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1251
 2011-07-06 17:56:15 +02:00
Christiaan Janssen
45212d3c1a QmlProfiler: handling start/stop actions 
Change-Id: I940025ba1f35f6136b4a12936b9e508ccb9d0d1f
Reviewed-on: http://codereview.qt.nokia.com/1160
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-05 13:13:00 +02:00
hjk
010d038f90 analyzer: remove shadowed start parameters 
Also, use only one Tool for all Qml profiling.

Change-Id: Ic79d0c3b8781f4dffd8e0cd77af014bf008f4c2e
Reviewed-on: http://codereview.qt.nokia.com/1157
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-05 12:13:55 +02:00
hjk
36a3028b9d analyzer: refactor progress 
Change-Id: If74c8035bc83a8113c2a15dcacefa38afbbbb4d8
Reviewed-on: http://codereview.qt.nokia.com/1056
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-04 12:02:36 +02:00
hjk
2086d94866 analyzer: finish split of tools into "tools-with-modes" 
Change-Id: I82b61c07172a33b861a7d6db903ac2516019498b
Reviewed-on: http://codereview.qt.nokia.com/1054
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-04 12:02:13 +02:00
hjk
99d9f065b3 analyzer: refactoring of analyzer manager 
Change-Id: I60268b8bc86e439beb3fca8f4b6a87ea03925bad
Reviewed-on: http://codereview.qt.nokia.com/1049
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-04 12:01:00 +02:00
Kai Koehne
5525e7d20d QmlProfiler: Rename TracePlugin to QmlProfileTraceClient 
Also move it into it's own file.

Change-Id: If063b0a4c6642b1e209e6a0026fedffd01603eb9
Reviewed-on: http://codereview.qt.nokia.com/841
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-28 17:04:48 +02:00
Friedemann Kleint
930dbd6c9f Compile. 
Change-Id: I47930a90b122c7b3863095e0ee4bfac61dba9cd8
Reviewed-on: http://codereview.qt.nokia.com/834
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-28 14:35:07 +02:00
Kai Koehne
949ffeb1b4 QmlProfiler: Support profiling applications on embedded Linux 
Allow on-device profiling e.g. on Meego/Harmattan.

Change-Id: I066b71078e1dab1b1369ff7275f72e88045d1bab
Reviewed-on: http://codereview.qt.nokia.com/784
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-28 14:05:11 +02:00
Kai Koehne
acd500aebd QmlProfiler: Implement missing slot 
Open the help page for the QML Profiler if the user clicks
'Help' after the debugger couldn't connect.

Change-Id: Ica540f8a3fb1e73865e2b8b4027fea50cd5e17b1
Reviewed-on: http://codereview.qt.nokia.com/818
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-06-28 13:42:09 +02:00
Kai Koehne
73b66f5d08 Analyzer: Use Utils::OutputFormat everywhere 
Replace hard distinction between 'out', 'err' with flexible
OutputFormat. Also make sure that QmlProfiler shows application output.

Change-Id: I130c71884321e4c59c9a75f0836c37a7f0e805c4
Reviewed-on: http://codereview.qt.nokia.com/458
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-06-14 10:14:19 +02:00
Kai Koehne
2f97c709de QmlProfiler: Support profiling via CODA on Symbian 
Change-Id: I44be1a67c95814a78c82b17e991e5e3a722a63c8
Reviewed-by: Christiaan Janssen
Reviewed-on: http://codereview.qt.nokia.com/428
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-10 14:37:36 +02:00
Kai Koehne
1f184bf2ad QmlProfiler: Track status of app through application output 
We do that already in the debugger too.

Change-Id: I31828a01aaec041ac38102b9bd034728d02486e2
Reviewed-on: http://codereview.qt.nokia.com/427
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-10 14:34:36 +02:00
hjk
f7fee744b9 qmlprofiler: ui and style 
Change-Id: I2153ef00f8d3c6d1cc4d39648916cad865b5a9be
Reviewed-on: http://codereview.qt.nokia.com/54
Reviewed-by: hjk
 2011-05-23 14:57:03 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Kai Koehne
6d174080e9 QmlProfiler: Factor out logic to run apps from the engine into a separate runner 
Reviewed-by: Christiaan Janssen
 2011-05-04 17:17:32 +02:00
Christiaan Janssen
d989d5d229 QmlProfiler: fix for 2cf76ead26 2011-04-28 16:18:57 +02:00
con
2cf76ead26 Move OutputFormatter to Utils lib. 2011-04-26 10:45:21 +02:00
Christiaan Janssen
72e65485a5 QmlProfiler: fixed arguments for qmlobserver when profiling 
Reviewed-by: Kai Koehne
 2011-04-15 17:31:21 +02:00
Kai Koehne
18bfabe0ee QmlProfiler: Fix slot signature 2011-04-15 09:01:34 +02:00
Kai Koehne
35493c454c QmlProfiler: Use ApplicationLauncher instead of QProcess 2011-04-14 17:36:45 +02:00
Kai Koehne
20cb599b8c QmlProfiler: Remove use of Qt private headers 
Use the copy of QDeclarativeDebugClient we ship with qtcreator.
However, since the internal one misses a waitForConnected any connection
will right now fail.
 2011-04-14 17:36:44 +02:00
Kai Koehne
e6620167fc QmlProfiler: Enable on Windows 
Replace use of sleep() call with a timer.
 2011-04-14 17:36:43 +02:00