Reviewed-by: kh1

Reviewed-by: kh1

Merge latest changes of master into merge :)

Conflicts:
	doc/qtcreator.qdoc

Since it will not work for pri files. The code is prepared to work
with pri files. However, currently it will work only in case
the pro file which includes the pri file lays in the same dir.
After the QTBUG-13057 is done it will be just a matter of
changing the apropriate variable name in librarydetailscontroller.cpp
to make it working properly.

Task-number: QTCREATORBUG-125

Conflicts:
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/gdbmacros/dumper.py
	share/qtcreator/gdbmacros/gdbmacros.py
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/debugger/gdb/attachgdbadapter.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/watchhandler.cpp
	src/plugins/mercurial/mercurialjobrunner.h
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qmljseditor/qmljseditor.pro
	src/plugins/qmljseditor/qmljseditorplugin.cpp
	src/plugins/qmljseditor/qmljseditorplugin.h
	src/plugins/qmljseditor/qmljspreviewrunner.cpp
	src/plugins/qmljseditor/qmljspreviewrunner.h
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
	src/plugins/qt4projectmanager/qt4projectmanager.pro
	src/plugins/qt4projectmanager/qtversionmanager.h
	src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
	src/plugins/qt4projectmanager/wizards/targetsetuppage.h

Reviewed-by: Leena Miettinen
(cherry picked from commit 0b99631b)

to be used for the promoted widgets dialog.
See also 00e954ca817f89958a8a8777d93d3843252dc88c in Qt 4.8.

Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Task-number: QTCREATORBUG-163

Task-number: QTCREATORBUG-2130

Remove some unused leftovers from DebuggerOuputWindow.

Task-number: QTCREATORBUG-1642

Task-Number: QTCREATORBUG-1997

Fix typo in commit c2a618ae.

Qt change f5c5e20ab20f016c0735 optimizes the calculation of the
children's bounding rect by taking the parent bounding rect into
account. This led to a recursion in the QuickDesigner Form Editor,
because LayerItem::boundingRect() is defined as the children's bounding
rect.

Break the cycle by setting ItemClipsChildrenToShape to false.
(cherry picked from commit 2067cfcf)

Due to the wrong enumerators being used, it was impossible to define
custom shortcuts for these actions.

Reviewed-by: mae
Task-number: QTCREATORBUG-2139

Remove unimplemented NOTIFY signals. Furthermore the signals must
be declared in the same class as the Q_PROPERTY (not in a base class):
Fix this in filefilteritems.h.

(cherry picked from commit 1e50be98)

Fixes compilation with Qt 4.7.1

... on canceling.

Do an initial connection check on the host
(once per host). Add utility function to
NetworkProtocol, displaying connection check
message box.
Move the 'Paste' handling into the PasteView
dialog, such that the checking happens there
and the dialog stays open if something fails.

Task-number: QTCREATORBUG-2117

Doc - Pull out instructions for setting up development environments for Maemo and Symbian, to reuse the topics in Nokia Qt SDK documentation (with if defines)

As it created 2 output panes that could be closed indepently
of each other.

Generated with Qt from commit 00bc7129d166f8f3e1486b8bf920d77f46400a6e
(qt-releases repo)

Fix breakage introduced by the new asynchronous stop() methods
of the debugger run controls. Allow for RunControl::stop() to
be asynchronous by introducing a return enumeration indicating
that. Introduce additional method aboutToStop() asking user
to quit (tie that to the RunControl instead of having to hack
the behaviour elsewhere).
If asynchronous stop is detected, terminate the ProjectExplorer
asynchronously.
This makes the behaviour consistent across switching sessions/
closing outputwindow tabs and quitting Qt Creator.

Reviewed-by: dt
Rubber-stamped-by: hjk