OS X: Fix alignment of "Copy" button in protocol #4207

2016-01-04 16:15:32 +01:00 · 2016-01-04 16:15:32 +01:00 · c8b3df6668
--- 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
--- a/src/3rdparty/qtkeychain
+++ b/src/3rdparty/qtkeychain
@ -0,0 +1 @@
+Subproject commit 08be0593e100a041585bcc704a1bbc5a812a1682
--- 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>
				`@ -0,0 +1 @@`
				`Subproject commit 08be0593e100a041585bcc704a1bbc5a812a1682`