Merge remote-tracking branch 'origin/2.4'

Conflicts:
	qtcreator.pri
	qtcreator.pro
	src/plugins/qtsupport/debugginghelperbuildtask.h

Change-Id: I6e013efa40ee4d5addcc76d6ff13e7f4fa98cc1d

dist/changes-2.4.1

@@ -5,13 +5,14 @@ list of changes, see the Git log for the Qt Creator sources that
 you can check out from the public Git repository. For example:
 
 git clone git://gitorious.org/qt-creator/qt-creator.git
-git log --cherry-pick --pretty=oneline v2.4.0..origin/2.4
+git log --cherry-pick --pretty=oneline v2.4.0..v2.4.1
 
 General
 
 Editing
 
 Managing Projects
+   * Fix a crash on closing a project while a parse is in progress (QTCREATORBUG-6677)
 
 Debugging
 
@@ -27,14 +28,19 @@ QML/JS Support
 Qt Quick Designer
 
 Help
+   * Fix loading of files from documentation (QTSDK-1129)
 
 Platform Specific
 
 Mac
+   * Only force mkspec with specific gcc version if the compiler path suggests it
+   * Find QMLViewer.app even if filesystem is case sensitive (QTCREATORBUG-5975)
+   * Build debugging helper with correct architecture (QTCREATORBUG-6737)
 
 Linux (GNOME and KDE)
 
 Windows
+   * Fix getting proxy settings
 
 Symbian Target
 

share/qtcreator/translations/qtcreator_zh_CN.ts

@@ -16722,7 +16722,7 @@ The following encodings are likely to fit:</source>
     </message>
     <message>
         <source>Number</source>
-        <translation>号</translation>
+        <translation>数字</translation>
     </message>
     <message>
         <source>String</source>
@@ -34175,7 +34175,7 @@ Local pulls are not applied to the master branch.</source>
     </message>
     <message>
         <source>&amp;Compiler path:</source>
-        <translation>编译器路进(&amp;C):</translation>
+        <translation>编译器路径(&amp;C):</translation>
     </message>
     <message>
         <source>Environment Variables</source>
@@ -34276,7 +34276,7 @@ Previous Qt versions have limitations in building suitable SIS files.</source>
     </message>
     <message>
         <source>Compiler path:</source>
-        <translation>编译器路进:</translation>
+        <translation>编译器路径:</translation>
     </message>
     <message>
         <source>System include path:</source>
@@ -36991,7 +36991,7 @@ Do you want to retry?</source>
     <name>ProjectExplorer::Internal::GccToolChainConfigWidget</name>
     <message>
         <source>&amp;Compiler path:</source>
-        <translation>编译器路进(&amp;C):</translation>
+        <translation>编译器路径(&amp;C):</translation>
     </message>
     <message>
         <source>&amp;ABI:</source>
@@ -38956,7 +38956,7 @@ You can build the application and deploy it on desktop and mobile target platfor
     </message>
     <message>
         <source>Creates a qmake-based subdirs project. This allows you to group your projects in a tree structure.</source>
-        <translation>创建一个基于qmake 的子项目. 这可以让你在一个树形结构李组织你的项目.</translation>
+        <translation>创建一个基于qmake 的子项目. 这可以让你在一个树形结构里组织你的项目.</translation>
     </message>
     <message>
         <source>Done &amp;&amp; Add Subproject</source>

src/plugins/qtsupport/debugginghelperbuildtask.cpp

@@ -107,6 +107,16 @@ DebuggingHelperBuildTask::DebuggingHelperBuildTask(const BaseQtVersion *version,
                         << QLatin1String("-k");
     }
     m_qmakeCommand = version->qmakeCommand();
+    m_qmakeArguments = QStringList() << QLatin1String("-nocache");
+    if (toolChain->targetAbi().os() == ProjectExplorer::Abi::MacOS
+            && toolChain->targetAbi().architecture() == ProjectExplorer::Abi::X86Architecture) {
+        // explicitly set 32 or 64 bit in case Qt is compiled with both
+        if (toolChain->targetAbi().wordWidth() == 32)
+            m_qmakeArguments << QLatin1String("CONFIG+=x86");
+        else if (toolChain->targetAbi().wordWidth() == 64) {
+            m_qmakeArguments << QLatin1String("CONFIG+=x86_64");
+        }
+    }
     m_makeCommand = toolChain->makeCommand();
     m_mkspec = version->mkspec();
 
@@ -177,7 +187,7 @@ bool DebuggingHelperBuildTask::buildDebuggingHelper(QFutureInterface<void> &futu
     arguments.makeCommand = m_makeCommand;
     arguments.makeArguments = m_makeArguments;
     arguments.qmakeCommand = m_qmakeCommand;
-    arguments.qmakeArguments = QStringList() << QLatin1String("-nocache");
+    arguments.qmakeArguments = m_qmakeArguments;
     arguments.targetMode = m_target;
     arguments.mkspec = m_mkspec;
     arguments.environment = m_environment;

src/plugins/qtsupport/debugginghelperbuildtask.h

@@ -90,6 +90,7 @@ private:
     QString m_qtInstallData;
     QString m_target;
     Utils::FileName m_qmakeCommand;
+    QStringList m_qmakeArguments;
     QString m_makeCommand;
     QStringList m_makeArguments;
     Utils::FileName m_mkspec;