Commit Graph

14 Commits

Author SHA1 Message Date
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