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
|
bf4dfd5e74
|
QmlProfiler: optimized timeline display
Change-Id: I0d7cf110356ef5f805b81a5fc39dca3870765ea3
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
|
2011-11-02 10:14:09 +01: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 |
|
Tobias Hunger
|
aa2acec14c
|
Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
|
2011-05-06 15:17:05 +02:00 |
|
Kai Koehne
|
7a25f6c34d
|
QmlProfiler: Move ui files to 'qml' subdir
|
2011-03-28 10:48:13 +02:00 |
|