[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-3.0.3-10-g981a6fa

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, master has been updated
       via  981a6fae5355576c6405a11e13729f998cc7d656 (commit)
      from  6d6b9bb9a88877cdf534fb0a555dd90703fbf0f6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 981a6fae5355576c6405a11e13729f998cc7d656
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Mar 1 08:31:51 2018 +0100

    Fix qt standardpaths on UNC paths
    
    * patches/qtbase/config-standardpaths.patch: Replace backslashes
    by one slash and not two.
    
    --
    This fixes the creation of invalid \\\\server paths when the
    appdata directory is redirected to an UNC path.
    
    GnuPG-Bug-Id: T3818

diff --git a/patches/qtbase/config-standardpaths.patch b/patches/qtbase/config-standardpaths.patch
index c1483e6..55d6610 100755
--- a/patches/qtbase/config-standardpaths.patch
+++ b/patches/qtbase/config-standardpaths.patch
@@ -98,7 +98,7 @@ diff -Nru qtbase-5.6.1.orig/src/corelib/io/qstandardpaths.cpp qtbase-5.6.1/src/c
 +#ifdef Q_OS_WIN
 +        wchar_t expandedPath[MAX_PATH] = {0};
 +        if (ExpandEnvironmentStrings((wchar_t*)value.utf16(), expandedPath, MAX_PATH)) {
-+            return QString::fromWCharArray(expandedPath).replace("\\", "//");
++            return QString::fromWCharArray(expandedPath).replace("\\", "/");
 +        }
 +        return value;
 +#endif

-----------------------------------------------------------------------

Summary of changes:
 patches/qtbase/config-standardpaths.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org