Eike Ziller
|
e5ca4b3462
|
Merge remote-tracking branch 'origin/2.3'
Conflicts:
qtcreator.pri
share/qtcreator/dumper/dumper.py
share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
src/plugins/valgrind/valgrind.pro
tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300
|
2011-07-15 14:29:07 +02:00 |
|
hjk
|
3cce72dcf5
|
analyzer: merge valgrind related settings
This mainly reduces the number of tabs in the settings dialog.
Change-Id: I62ba5c74585648c8f495602cd4d676d0628de9b5
Reviewed-on: http://codereview.qt.nokia.com/1575
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
2011-07-13 15:56:48 +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 |
|
hjk
|
8bb99e4c75
|
analyzer: merge valgrind based tool plugins
It is hard to imagine there is a real use case that someone wants one but
absolutely not the other.
Change-Id: I58bb57912f2edeacf2d5a24e3b2eb5a81262eabd
Reviewed-on: http://codereview.qt.nokia.com/66
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
2011-05-23 13:55:11 +02:00 |
|