Merge remote-tracking branch 'origin/2.4'

Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp

Change-Id: Id032187023bb42f259a87545ceeb3c965dd01a32

src/plugins/debugger/gdb/gdbengine.cpp

@@ -189,7 +189,7 @@ static QByteArray parsePlainConsoleStream(const GdbResponse &response)
 
 GdbEngine::GdbEngine(const DebuggerStartParameters &startParameters,
         DebuggerEngine *masterEngine)
-  : DebuggerEngine(startParameters, masterEngine)
+  : DebuggerEngine(startParameters, CppLanguage, masterEngine)
 {
     setObjectName(_("GdbEngine"));
 

src/plugins/debugger/gdb/localplaingdbadapter.cpp

@@ -128,6 +128,9 @@ void LocalPlainGdbAdapter::shutdownAdapter()
 
 void LocalPlainGdbAdapter::checkForReleaseBuild()
 {
+#ifndef Q_OS_MAC
+    // There is usually no objdump on Mac, and if there is,
+    // there are no .debug_info sections.
     QString objDump = _("objdump");
     // Windows: Locate objdump in the debuggee's (MinGW) environment
     if (ProjectExplorer::Abi::hostAbi().os() == ProjectExplorer::Abi::WindowsOS
@@ -166,6 +169,7 @@ void LocalPlainGdbAdapter::checkForReleaseBuild()
            tr("This does not seem to be a \"Debug\" build.\n"
               "Setting breakpoints by file name and line number may fail."));
     }
+#endif
 }
 
 void LocalPlainGdbAdapter::interruptInferior()