[Pkg-owncloud-commits] [owncloud-client] 57/171: OS X: Fix alignment of "Copy" button in protocol #4207

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to annotated tag upstream/2.1.1+dfsg
in repository owncloud-client.

commit c8b3df6668469de07626141d3bf32cc894e6676d
Author: Markus Goetz <markus at woboq.com>
Date:   Mon Jan 4 16:15:32 2016 +0100

    OS X: Fix alignment of "Copy" button in protocol #4207
---
 .gitmodules               | 3 +++
 src/3rdparty/qtkeychain   | 1 +
 src/gui/protocolwidget.ui | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index ba3b738..2b1e974 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "src/3rdparty/libcrashreporter-qt"]
 	path = src/3rdparty/libcrashreporter-qt
 	url = git://github.com/dschmidt/libcrashreporter-qt.git
+[submodule "src/3rdparty/qtkeychain"]
+	path = src/3rdparty/qtkeychain
+	url = https://github.com/frankosterfeld/qtkeychain.git
diff --git a/src/3rdparty/qtkeychain b/src/3rdparty/qtkeychain
new file mode 160000
index 0000000..08be059
--- /dev/null
+++ b/src/3rdparty/qtkeychain
@@ -0,0 +1 @@
+Subproject commit 08be0593e100a041585bcc704a1bbc5a812a1682
diff --git a/src/gui/protocolwidget.ui b/src/gui/protocolwidget.ui
index 1569a89..2476043 100644
--- a/src/gui/protocolwidget.ui
+++ b/src/gui/protocolwidget.ui
@@ -57,7 +57,7 @@
      </column>
     </widget>
    </item>
-   <item row="2" column="1">
+   <item row="2" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="_dialogButtonBox"/>
    </item>
   </layout>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git