Commit Graph

5 Commits

Author SHA1 Message Date
Nicolas Arnaud-Cormos
5873e52ada Fix header path in valgrind plugin.
analyzerconstants is part of the analyzerbase plugin.
This fix building the valgrind tests.

Change-Id: I298fd08b456bd49bbeb12df4f2bb878e8452f76d
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-10 10:07:46 +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
2c2a8a7889 analyzer: merge start and startRemote partially
Change-Id: Iaa837f5bc696af7e71bbed128b9a5c8c46e512c7
Reviewed-by: hjk <qthjk@ovi.com>
2011-10-20 16:10:33 +02:00
hjk
98c116491f valgrind: code cosmetics
Change-Id: I695c7d40aeb0b0b1e6f8cc0856e5fa5d9d1ce2d1
Reviewed-on: http://codereview.qt.nokia.com/1600
Reviewed-by: hjk <qthjk@ovi.com>
2011-07-13 15:39:04 +02:00