[qt-creator/f20] Rebase patch

[Sandro Mani]

commit 2a4919d72295676d0a0836f81a433ac283df4d60
Author: Sandro Mani <manisandro at gmail.com>
Date:   Thu Aug 21 22:33:49 2014 +0200

    Rebase patch

 qt-creator_docdir.patch |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/qt-creator_docdir.patch b/qt-creator_docdir.patch
index 6872432..c740c09 100644
--- a/qt-creator_docdir.patch
+++ b/qt-creator_docdir.patch
@@ -1,6 +1,6 @@
-diff -rupN qt-creator-opensource-src-3.1.2/doc/api/qtcreator-documentation.qdoc qt-creator-opensource-src-3.1.2-new/doc/api/qtcreator-documentation.qdoc
---- qt-creator-opensource-src-3.1.2/doc/api/qtcreator-documentation.qdoc	2014-06-19 17:30:25.000000000 +0200
-+++ qt-creator-opensource-src-3.1.2-new/doc/api/qtcreator-documentation.qdoc	2014-07-29 13:34:19.077320785 +0200
+diff -rupN qt-creator-opensource-src-3.2.0-rc1/doc/api/qtcreator-documentation.qdoc qt-creator-opensource-src-3.2.0-rc1-new/doc/api/qtcreator-documentation.qdoc
+--- qt-creator-opensource-src-3.2.0-rc1/doc/api/qtcreator-documentation.qdoc	2014-08-01 11:17:30.000000000 +0200
++++ qt-creator-opensource-src-3.2.0-rc1-new/doc/api/qtcreator-documentation.qdoc	2014-08-06 11:04:48.010941610 +0200
 @@ -283,7 +283,7 @@
      The \QC Manual HTML files are generated in the \c {doc/html} directory.
      The Extending \QC Manual files are generated in the
@@ -8,11 +8,11 @@ diff -rupN qt-creator-opensource-src-3.1.2/doc/api/qtcreator-documentation.qdoc
 -    \c {share/doc/qtcreator} directory in the \QC build directory on Windows and
 +    \c {share/doc/qt-creator} directory in the \QC build directory on Windows and
      Linux, and in the \c {bin/Qt Creator.app/Contents/Resources/app} directory
-     on Mac OS. You can view the HTML files in a browser and the help files in
+     on OS X. You can view the HTML files in a browser and the help files in
      the \QC \gui Help mode. For more information about adding the help files to
-diff -rupN qt-creator-opensource-src-3.1.2/doc/doc.pri qt-creator-opensource-src-3.1.2-new/doc/doc.pri
---- qt-creator-opensource-src-3.1.2/doc/doc.pri	2014-06-19 17:30:25.000000000 +0200
-+++ qt-creator-opensource-src-3.1.2-new/doc/doc.pri	2014-07-29 13:34:19.256320777 +0200
+diff -rupN qt-creator-opensource-src-3.2.0-rc1/doc/doc.pri qt-creator-opensource-src-3.2.0-rc1-new/doc/doc.pri
+--- qt-creator-opensource-src-3.2.0-rc1/doc/doc.pri	2014-08-01 11:17:30.000000000 +0200
++++ qt-creator-opensource-src-3.2.0-rc1-new/doc/doc.pri	2014-08-06 11:04:48.011941609 +0200
 @@ -78,12 +78,12 @@ dev_qch_docs.depends += dev_html_docs
  
  !macx {
@@ -28,10 +28,10 @@ diff -rupN qt-creator-opensource-src-3.1.2/doc/doc.pri qt-creator-opensource-src
      inst_dev_qch_docs.CONFIG += no_check_exist no_default_install
      INSTALLS += inst_dev_qch_docs
  
-diff -rupN qt-creator-opensource-src-3.1.2/qtcreator.pri qt-creator-opensource-src-3.1.2-new/qtcreator.pri
---- qt-creator-opensource-src-3.1.2/qtcreator.pri	2014-06-19 17:30:25.000000000 +0200
-+++ qt-creator-opensource-src-3.1.2-new/qtcreator.pri	2014-07-29 13:34:19.265320777 +0200
-@@ -146,7 +146,7 @@ macx {
+diff -rupN qt-creator-opensource-src-3.2.0-rc1/qtcreator.pri qt-creator-opensource-src-3.2.0-rc1-new/qtcreator.pri
+--- qt-creator-opensource-src-3.2.0-rc1/qtcreator.pri	2014-08-01 11:17:30.000000000 +0200
++++ qt-creator-opensource-src-3.2.0-rc1-new/qtcreator.pri	2014-08-06 11:04:48.011941609 +0200
+@@ -160,7 +160,7 @@ macx {
      IDE_PLUGIN_PATH  = $$IDE_LIBRARY_PATH/plugins
      IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME
      IDE_DATA_PATH    = $$IDE_BUILD_TREE/share/qtcreator
@@ -40,10 +40,10 @@ diff -rupN qt-creator-opensource-src-3.1.2/qtcreator.pri qt-creator-opensource-s
      IDE_BIN_PATH     = $$IDE_APP_PATH
      !isEqual(IDE_SOURCE_TREE, $$IDE_BUILD_TREE):copydata = 1
  }
-diff -rupN qt-creator-opensource-src-3.1.2/qtcreator.qbs qt-creator-opensource-src-3.1.2-new/qtcreator.qbs
---- qt-creator-opensource-src-3.1.2/qtcreator.qbs	2014-06-19 17:30:25.000000000 +0200
-+++ qt-creator-opensource-src-3.1.2-new/qtcreator.qbs	2014-07-29 13:34:19.599320762 +0200
-@@ -41,7 +41,7 @@ Project {
+diff -rupN qt-creator-opensource-src-3.2.0-rc1/qtcreator.qbs qt-creator-opensource-src-3.2.0-rc1-new/qtcreator.qbs
+--- qt-creator-opensource-src-3.2.0-rc1/qtcreator.qbs	2014-08-01 11:17:30.000000000 +0200
++++ qt-creator-opensource-src-3.2.0-rc1-new/qtcreator.qbs	2014-08-06 11:04:48.012941609 +0200
+@@ -42,7 +42,7 @@ Project {
              : ide_app_path
      property string ide_doc_path: qbs.targetOS.contains("osx")
              ? ide_data_path + "/doc"
@@ -52,10 +52,10 @@ diff -rupN qt-creator-opensource-src-3.1.2/qtcreator.qbs qt-creator-opensource-s
      property string ide_bin_path: qbs.targetOS.contains("osx")
              ? ide_app_target + ".app/Contents/MacOS"
              : ide_app_path
-diff -rupN qt-creator-opensource-src-3.1.2/src/plugins/coreplugin/icore.cpp qt-creator-opensource-src-3.1.2-new/src/plugins/coreplugin/icore.cpp
---- qt-creator-opensource-src-3.1.2/src/plugins/coreplugin/icore.cpp	2014-06-19 17:30:25.000000000 +0200
-+++ qt-creator-opensource-src-3.1.2-new/src/plugins/coreplugin/icore.cpp	2014-07-29 13:34:15.884320927 +0200
-@@ -404,7 +404,7 @@ QString ICore::userResourcePath()
+diff -rupN qt-creator-opensource-src-3.2.0-rc1/src/plugins/coreplugin/icore.cpp qt-creator-opensource-src-3.2.0-rc1-new/src/plugins/coreplugin/icore.cpp
+--- qt-creator-opensource-src-3.2.0-rc1/src/plugins/coreplugin/icore.cpp	2014-08-01 11:17:30.000000000 +0200
++++ qt-creator-opensource-src-3.2.0-rc1-new/src/plugins/coreplugin/icore.cpp	2014-08-06 11:04:48.012941609 +0200
+@@ -422,7 +422,7 @@ QString ICore::userResourcePath()
  QString ICore::documentationPath()
  {
      const QString docPath = QLatin1String(Utils::HostOsInfo::isMacHost()