Merge remote branch 'origin/2.0'

Conflicts:
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
	src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
	tests/manual/gdbdebugger/simple/app.cpp

src/plugins/debugger/gdb/pythongdbengine.cpp

@@ -81,6 +81,8 @@ void GdbEngine::updateLocalsPython(const QByteArray &varList)
         options += "fancy,";
     if (theDebuggerBoolSetting(AutoDerefPointers))
         options += "autoderef,";
+    if (!qgetenv("QTC_DEBUGGER_PYTHON_VERBOSE").isEmpty())
+        options += "pe,";
     if (options.isEmpty())
         options += "defaults,";
     options.chop(1);