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

View File

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

View File

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