1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'pr2519'

This commit is contained in:
tux3 2015-12-04 11:54:08 +01:00
commit bd1f22963b
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
3 changed files with 6 additions and 6 deletions

View File

@ -23,10 +23,10 @@
</size>
</property>
<property name="windowTitle">
<string>qTox</string>
<string notr="true">qTox</string>
</property>
<property name="windowIcon">
<iconset resource="../../res.qrc">
<iconset resource="../res.qrc">
<normaloff>:/img/icons/qtox.svg</normaloff>:/img/icons/qtox.svg</iconset>
</property>
<widget class="QStackedWidget" name="stackedWidget">
@ -417,7 +417,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../../res.qrc">:/img/login_logo.svg</pixmap>
<pixmap resource="../res.qrc">:/img/login_logo.svg</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@ -425,7 +425,7 @@
</widget>
</widget>
<resources>
<include location="../../res.qrc"/>
<include location="../res.qrc"/>
</resources>
<connections/>
</ui>

View File

@ -17,7 +17,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>

View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>