Merge branch 'v0.6' into qt5-wip #2237

Open
kashikoibumi wants to merge 38 commits from kashikoibumi/qt5-wip into v0.6
3 changed files with 0 additions and 9 deletions
Showing only changes of commit 3e3985267a - Show all commits

View File

@ -104,8 +104,5 @@
<header>bitmessageqt.settingsmixin</header> <header>bitmessageqt.settingsmixin</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources>
<include location="bitmessage_icons.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

View File

@ -299,8 +299,5 @@
<header>bitmessageqt.settingsmixin</header> <header>bitmessageqt.settingsmixin</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources>
<include location="bitmessage_icons.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

View File

@ -1086,9 +1086,6 @@
<tabstop>checkBoxSocksListen</tabstop> <tabstop>checkBoxSocksListen</tabstop>
<tabstop>buttonBox</tabstop> <tabstop>buttonBox</tabstop>
</tabstops> </tabstops>
<resources>
<include location="bitmessage_icons.qrc"/>
</resources>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>