Merge remote-tracking branch 'origin/3.1'

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/qtsupport/qtversionmanager.cpp
	src/shared/qbs

Change-Id: If7a93fb018799fe6ada76e79c24ab5b43dfa6fc2

src/plugins/coreplugin/core.qrc

@@ -76,5 +76,6 @@
         <file>images/panel_manage_button.png</file>
         <file>images/sidebysidediff.png</file>
         <file>images/textdiff.png</file>
+        <file>images/pause.png</file>
     </qresource>
 </RCC>

src/plugins/coreplugin/coreconstants.h

@@ -211,6 +211,7 @@ const char ICON_SIDE_BY_SIDE_DIFF[]  = ":/core/images/sidebysidediff.png";
 const char ICON_TEXT_DIFF[]          = ":/core/images/textdiff.png";
 const char ICON_FILTER[]             = ":/core/images/filtericon.png";
 const char ICON_LINK[]               = ":/core/images/linkicon.png";
+const char ICON_PAUSE[]              = ":/core/images/pause.png";
 const char ICON_QTLOGO_32[]          = ":/core/images/logo/32/QtProject-qtcreator.png";
 const char ICON_QTLOGO_64[]          = ":/core/images/logo/64/QtProject-qtcreator.png";
 const char ICON_QTLOGO_128[]         = ":/core/images/logo/128/QtProject-qtcreator.png";