feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
68,568 Commits 108 Branches 368 Tags
ac47d51bfb379b8c3b51d832d54a90dba18a518f
Commit Graph

1631 Commits

Author SHA1 Message Date
Christiaan Janssen
98050a701a QmlProfiler: colorized toolbar icons 
Change-Id: I6cfe1abb44183216f544211f70c1bed810dd3d3e
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-12-06 16:33:55 +01:00
Christiaan Janssen
1cd6972ac8 QmlProfiler: minor adjustments to timeline UI 
Change-Id: I74460d9a32ced707fa4a550199bba5f5906f417e
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-12-05 10:10:40 +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
Christiaan Janssen
37161a4194 QmlProfiler: next and previous buttons have now consistent behaviour 
Having them behave differently depending on the locked mode was
confusing.  This patch moves that functionality to the event labels,
thus next and prev just select next and previous events in the
timeline, in strict chronological order.

Change-Id: I5bd996199dd6a4af4c65e3205493f17495d0135b
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-11-24 15:52:31 +01:00
Christiaan Janssen
8c64d132fd QmlProfiler: improved look of the timeline UI 
Change-Id: I5d79394529f3ba303e7353a60df77f59bbe38a12
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-11-24 13:53:05 +01:00
Friedemann Kleint
b0eff051c1 Add Qt 5 libraries to .pro files. 
Make Qt Creator compile with Qt 5 after using fixqt4headers.pl.

Change-Id: I74ca51d562f49378b40103b79848f5dd3b11e77e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-24 12:02:30 +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
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
Christiaan Janssen
d2514e18f1 QmlProfiler: fix crash with context menu when nothing is selected 
Change-Id: I8e5e47e1fcc620c823e7d3e1c5a643fb09d4b392
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-16 09:25:35 +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
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
Kai Koehne
e249265a96 QmlProfiler: Don't let timer run if we cannot connect to port 
Previously the timer was started as soon as we connect, but we
should actually make sure the service is there.

Change-Id: Ic59ccb4a402a54dc1fc1f0c92ca2f80dad436581
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-11-11 12:51:44 +01:00
Eike Ziller
d1d85ba912 more s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: I5eecac63f45cf5bd192bd2ee42370d6338c1ec9f
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-11 10:53:34 +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
92fcf1e169 QmlProfiler: fix crash in timeline when repaint too slow 
Change-Id: I94e7dfd90759f4021e35fb9590e414b0ab3de01d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-10 10:38:42 +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
bddfae7182 QmlProfiler: refactor postprocess step in internal statistics 
Change-Id: Id6ea03161ccad92a27a664e84f56b2a49400be91
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-09 16:34:17 +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
Friedemann Kleint
1c4d9e4871 Fix warnings about assigned/unused variables (gcc 4.6). 
Change-Id: Ifdeb2e25ecb0e11a78c5353aaf68782464c9a676
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-11-09 08:29:49 +01:00
Christiaan Janssen
71763310ad QmlProfiler: center event on clicked in details 
Change-Id: I6e81089b3014f15545be4c40e0909ff2a37dbe1b
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-04 14:56:54 +01:00
Christiaan Janssen
71e053d67a QmlProfiler: render background in gray when outside trace 
Change-Id: I80a44f80e12a05e9c3be6ea708f8be41435792b7
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-03 15:40:47 +01:00
Christiaan Janssen
886e613572 QmlProfiler: nonzero trace starttimes 
Change-Id: I734c1af79a4975f5f331f212721331ea877b391a
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-03 12:48:18 +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
hjk
29279ab8c7 more style fixes of string literal access 
Change-Id: I60b0c53681c6a0cc38231e805479deb614aa0096
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-02 18:20:19 +01:00
hjk
7efa115245 compile fix with namespaces 
Change-Id: Ib52448a75955df763e0222b8a75e580ca6c7ad7c
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-02 17:40:56 +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
bf4dfd5e74 QmlProfiler: optimized timeline display 
Change-Id: I0d7cf110356ef5f805b81a5fc39dca3870765ea3
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-02 10:14:09 +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
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
Christiaan Janssen
267b96e18e QmlProfiler: Selection Range 
Change-Id: Ifa39de4762c05dc859cbd764a10760a82821d74f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-01 16:33:58 +01:00
Christiaan Janssen
c9f977c39a QmlProfiler: main view with fixed height and scrollable 
Change-Id: Ib77ad6ba5afe13d692d85c7027e3e1d4b2fbb6a7
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-01 15:13:39 +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
Kai Koehne
5113d6f989 QmlProfiler: Improve copy to clipboard feature 
Only use tabs as delimiters, not as indentation. Also, copy the headers
when copying the whole table.

Change-Id: I56ac598d922ccded3f43dfc0fe6633716bf37762
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-10-31 13:07:54 +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
Christiaan Janssen
55420e2b70 QmlProfiler: fix offset difference between timeline and overview 
Change-Id: Ic91a203018e31eb14445deb39fa5a83ebc621ee7
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-10-20 17:41:50 +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
Eike Ziller
fc6a7f0dd9 Merge remote-tracking branch 'origin/2.4' 2011-10-11 16:14:33 +02:00
Kai Koehne
e38f2ba675 QmlProfiler: Align Attach dialog to the debugger one 
Change-Id: Ic401c81848493ff77cb4f6fdeb5fb7a08042b930
Reviewed-on: http://codereview.qt-project.org/6441
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-10-11 16:12:44 +02:00
Christiaan Janssen
bc4d15f3c6 QmlProfiler: use end of trace event if present 
Change-Id: I149a05500fd4bc722da3c409491b35304155828b
Reviewed-on: http://codereview.qt-project.org/6436
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-10-11 14:52:57 +02:00
Christiaan Janssen
6a988ee8ac QmlProfiler: fixed bug in elapsed display when finishing trace 
Change-Id: I85c376b45eb6308c4af4e80032e37379b12ef8e0
Reviewed-on: http://codereview.qt-project.org/6425
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-10-11 12:21:09 +02:00
Christiaan Janssen
a3d0b084a5 QmlProfiler: changes in rangedetails and selection of items 
Change-Id: Ic665596cd4f01459b69738363b64ee3b9e5d5b74
Reviewed-on: http://codereview.qt-project.org/6327
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-10-10 17:27:35 +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