Commit Graph

2 Commits

Author SHA1 Message Date
Lasse Holmstedt
4e5089d90d Merge branch 'debugintegration'
Conflicts:
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlproject.h
2010-02-16 16:30:41 +01:00
Lasse Holmstedt
580280af26 Changed QML Inspector from a separate global mode to a plugin.
The new QML Inspector depends on DebuggerPlugin. Also added a dropdown menu into
the debugger toolbar from which the user can select the used debugging
language, e.g. C++ or QML.
2010-02-16 15:13:09 +01:00