[SCM] qtcreator packaging branch, master, updated. debian/3.2.1+dfsg-7-5-ge885d18

[Adam Majer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=ac4c768

The following commit has been merged in the master branch:
commit ac4c768fd83457f4efd325bcef5d01970cf1d9d8
Author: Adam Majer <adamm at zombino.com>
Date:   Tue Jan 6 13:42:52 2015 -0600

    Fix documentation path
---
 debian/patches/fix_documentation_path.diff | 13 +++++++++++++
 debian/patches/series                      |  1 +
 2 files changed, 14 insertions(+)

diff --git a/debian/patches/fix_documentation_path.diff b/debian/patches/fix_documentation_path.diff
new file mode 100644
index 0000000..d1f774d
--- /dev/null
+++ b/debian/patches/fix_documentation_path.diff
@@ -0,0 +1,13 @@
+Index: qtcreator/src/plugins/coreplugin/icore.cpp
+===================================================================
+--- qtcreator.orig/src/plugins/coreplugin/icore.cpp	2014-12-08 06:58:49.000000000 -0600
++++ qtcreator/src/plugins/coreplugin/icore.cpp	2015-01-01 02:56:43.042709789 -0600
+@@ -422,7 +422,7 @@
+ QString ICore::documentationPath()
+ {
+     const QString docPath = QLatin1String(Utils::HostOsInfo::isMacHost()
+-                                            ? "/../Resources/doc" : "/../share/doc/qtcreator");
++                                            ? "/../Resources/doc" : "/../share/qtcreator/doc");
+     return QDir::cleanPath(QCoreApplication::applicationDirPath() + docPath);
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e7e4d5a..b866d0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ qt_versions_trough_qtchooser.patch
 botan_system_lib.diff
 always_autotect_qt_versions
 missing_header.diff
+fix_documentation_path.diff

-- 
qtcreator packaging