Commit Graph

19 Commits

Author SHA1 Message Date
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
Kai Koehne
bd28997385 QmlProfiler: Properly initialize variable
Change-Id: I9ecc8807b9319a6317e8f5f5711deadb45031f75
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-03-14 12:27:10 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
Christiaan Janssen
5d28d58c57 QmlProfiler: fixed font rendering problem on OsX
Change-Id: I86b4474aeadb991ba8591784945371e8ac925b00
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-02-10 16:45:57 +01: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
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
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
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
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
c47b2aeda4 QmlProfiler: fix Context2D error when resizing
Change-Id: I9de22ea823b35bfd1893cf1388dfd82d332e275d
Reviewed-on: http://codereview.qt.nokia.com/1358
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2011-07-08 12:10:56 +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
Friedemann Kleint
ddf4b613f3 Krazy fixes (spelling, single char strings, char constants). 2011-05-10 15:21:41 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
Christiaan Janssen
fad891820d qQmlProfiler: independent start/stop/record buttons
Reviewed-by: Kai Koehne
2011-04-06 12:59:29 +02:00
Christiaan Janssen
80036b8905 QmlProfiler: rendering optimizations
Reviewed-by: Kai Koehne
2011-04-05 12:54:04 +02:00
hjk
8fac439e86 compile fixes on *nix 2011-03-24 13:02:57 +01:00
Christiaan Janssen
f774556de7 QmlProfiler: first commit 2011-03-24 11:07:59 +01:00