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 |
|
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 |
|
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 |
|
Kai Koehne
|
aa5d5c6b86
|
QmlProfiler: Add missing copyright header
|
2011-05-09 17:36:25 +02:00 |
|
Kai Koehne
|
12a02c7534
|
QmlProfiler: Add attach/detach menu entry
This allows one to also profile apps on device (as long as there
is a working TCP/IP connection).
|
2011-04-04 15:59:31 +02:00 |
|