feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
39,158 Commits 108 Branches 368 Tags
9c53c1dbea368bd8d65a8f7b16db160b3c25cf7d
Commit Graph

39 Commits

Author SHA1 Message Date
Ulf Hermann
bc4586ffbe QmlProfiler: Make TimeDisplay and TimeMarks declarative 
Create the vertical elements only once and stretch them over the whole
vertical space, but keep all horizontal elements distinct per model.
Also, add horizontal elements to the labels group and rename that
accordingly, so that we don't need a third Flickable or ListView

Change-Id: I4fe3bd526767e8ff5d0ebcd70e9343f65fcc787f
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-12-05 14:15:08 +01:00
Ulf Hermann
70102410df QmlProfiler: Centralize trace/window/range times 
Avoid keeping multiple, potentially diverging copies of the same time
information and make sure all the times are consistent with each other.

Stating the times as properties allows us to use bindings in more
places, too.

Change-Id: I9cdd4f561ac22ad795939594ba340b1fbc070e9a
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-11-21 10:53:28 +01:00
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h

Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
 2014-10-14 15:36:16 +02:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Ulf Hermann
82793e7339 QmlProfiler: Try harder to obtain a canvas context 
The QML canvas is notoriously bad at keeping its context around. This
workaround gives us a valid context in many of these cases.

Change-Id: I6c23aa2b44c10a48cdb89c66a2861ab8d31bcfc8
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-09-10 15:56:53 +02:00
Ulf Hermann
6d41c6922f QmlProfiler: put all of the traceview in one QQuickView 
Having multiple views not only is bad for performance but also creates
difficult to debug problems on some hardware configurations and is
fairly confusing.

Task-number: QTBUG-38222
Change-Id: I885e800b1ededab9137874105e3b2f9ec88a06e8
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-06-06 14:21:28 +02:00
Ulf Hermann
c8a814c289 QmlProfiler: Always reset the context before drawing on a canvas 
The context is stateful and there could be any kind of junk left in it.
In particular, the W3C spec says that it should be set up with a default
clipping path on creation, but it doesn't say what should happen if the
canvas is resized. Thus, we can never be sure that the clipping path is
sane.

Task-number: QTBUG-38297
Change-Id: If04597234e71574573888ce14deac5cf50df4a3f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-04-14 10:50:38 +02:00
Ulf Hermann
0c9a9348f9 QmlProfiler: Consistently clear when clear button pressed 
Several QML properties need extra treatment to avoid stale data
after clearing. Toggling the visibility of the timeline renderer
doesn't really help there.

Task-number: QTCREATORBUG-11833

Change-Id: I1903d7bd69d6fe31ecc4cadca8e30fa2104fa09a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-03-31 10:39:52 +02:00
Ulf Hermann
bd43c1c51b QmlProfiler: take the left border into account when painting time marks 
Without this the time marks are 1 pixel off in relation to the main
view.

Change-Id: Iee8aaee447fedb9c57934c8089874414d9000995
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-02-27 14:54:56 +01:00
Ulf Hermann
0b6b67ca07 QmlProfiler: Don't use the canvas context if it isn't ready 
The documentation indicates that onPaint can actually be called
while the context isn't ready.

Change-Id: I32d861e016e5e990f3d940a35ec28956902041ba
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-02-26 15:33:26 +01:00
Ulf Hermann
cd85ac700d QmlProfiler: Remove gradient borders 
It just looks so much better with "clean" borders.

Change-Id: I9aae0e6f24556042e23580e224abb696913fc989
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-02-25 17:46:15 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
 2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
Ulf Hermann
d36cb8b476 QmlProfiler: Remove custom canvas implementation 
The canvas integrated in QtQuick does the same thing. We can remove a
lot of code like this.

Change-Id: I6425ae4e1b542107defd9d76fa5755712a0f8613
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-12-03 15:01:16 +01:00
Ulf Hermann
38583c79a2 QmlProfiler: Improve readability of time labels 
Previously there would sometimes be a long line of equal time labels
if you selected a small range from the middle of a long trace. This
patch increases the accuracy of the labels based on selected range,
not on start time.

Task-number: QTCREATORBUG-10865

Change-Id: I482da242c5e9f0117611f100888e80e23ad91b4c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-11-22 11:46:10 +01:00
Ulf Hermann
acba504a53 QmlProfiler: Centralize redrawing of custom canvas 
Don't handle redraw events in QML anymore and instead trigger a redraw
on geometryChange as well as componentComplete from C++. This reduces
redundant code and glitches from forgotten QML event handlers.

Change-Id: I0eadfb54cf8e392152c4d91b83c874b37b1aca96
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-11-21 15:34:50 +01:00
Kai Koehne
0d65cf11d0 QmlProfiler: Set objectNames to QmlProfilerCanvas instances 
Helps debugging ...

Change-Id: I9d6508e05e5f581f7d43f4b015fcfd4596f5d5ec
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-11-05 10:29:34 +01:00
Aurindam Jana
c9a851c649 QmlProfiler: Avoid generic property types in QML 
Change-Id: I4dddf19d37004f59bfbe75b45e0b626bf1563fa2
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-09-18 10:37:33 +02:00
Aurindam Jana
a2d771b41e QmlProfiler: Update Qt Quick 2.0 to Quick 2.1 
Change-Id: Ib40cf370798e12540d81e2f7ec532bb119293e4e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-09-18 10:37:21 +02:00
Thomas Hartmann
9e58ab2ac8 QmlProfiler: Initial conversion from Quick 1 to Quick 2 
Updated class names and functions. Fixed imports.

Change-Id: I5f12e3a108a0e60c091acc9c415ff77e52118029
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-09-16 14:35:53 +02:00
Robert Loehning
298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02: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
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
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
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
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
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
d2911d70f3 QmlProfiler: New event list with caching, load, save 
Change-Id: I640a16649156a49f2d7e7006d6b2ea38fe218620
Reviewed-on: http://codereview.qt.nokia.com/3043
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-08-17 12:33:39 +02:00
Christiaan Janssen
db6bf5be59 QmlProfiler: fixed artifacts when rendering background 
Change-Id: I7707657b6788316a82ca9b3df33bf00e3692d75e
Reviewed-on: http://codereview.qt.nokia.com/1360
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-07-08 12:44:44 +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
Daniel Molkentin
5e2f3f0d5e QML l10n fixes 
- qsTr(): don't use + for visible strings.
- add welcomescreen to translation.pro

Change-Id: I361ef4a74bd0098cd7a7ee6b596b2b281661d50b
Reviewed-on: http://codereview.qt.nokia.com/920
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-30 10:20:40 +02:00
Christiaan Janssen
17db97b698 QmlProfiler: show ranges in time display 
Change-Id: I6f42db3d5de02ee0198ff51aae8421bbdc5ea9c4
Reviewed-on: http://codereview.qt.nokia.com/836
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-28 16:35:32 +02:00
Christiaan Janssen
2b8920405d QmlProfiler: Next and Previous controls 
Change-Id: Iedac6ee9f3cc9855a5825fc5f82b79a06da4f1fb
Reviewed-on: http://codereview.qt.nokia.com/767
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-06-28 09:59:59 +02:00
Christiaan Janssen
eb41ffe539 QmlProfiler: Time display with 3 decimals 
Change-Id: I2421f7cd01e89a41489d5e6355cc83833e21ffcc
Reviewed-on: http://codereview.qt.nokia.com/535
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-06-21 11:39:30 +02:00
Christiaan Janssen
b7796436a2 QmlProfiler: time display 
Change-Id: Ib1a0e7693f00e3d870407c62f7f238c962ef8b48
Reviewed-on: http://codereview.qt.nokia.com/529
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-06-21 10:00:50 +02:00