diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-12 17:29:16 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-12 17:29:16 -0300 |
| commit | 0bc57968a5b0f9f92aace387e1ebcd8e6e4362cc (patch) | |
| tree | 605eb2e679dfa6e94f91944d71a81563647b8ac7 /src/leap/bitmask/gui/ui/mainwindow.ui | |
| parent | 39334868d40f56cac70ebd183e25a79504163fd1 (diff) | |
| parent | 6c1c38598677b01a9f30c201aeb72fbbfcc5e117 (diff) | |
Merge remote-tracking branch 'ivan/bug/update-ui-resources-path' into develop
Diffstat (limited to 'src/leap/bitmask/gui/ui/mainwindow.ui')
| -rw-r--r-- | src/leap/bitmask/gui/ui/mainwindow.ui | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui index ecd3cbe9..9c4e6ff0 100644 --- a/src/leap/bitmask/gui/ui/mainwindow.ui +++ b/src/leap/bitmask/gui/ui/mainwindow.ui @@ -14,7 +14,7 @@ <string>Bitmask</string> </property> <property name="windowIcon"> - <iconset resource="../../../../data/resources/mainwindow.qrc"> + <iconset resource="../../../../../data/resources/mainwindow.qrc"> <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset> </property> <property name="inputMethodHints"> @@ -166,7 +166,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="../../../../data/resources/mainwindow.qrc">:/images/mask-launcher.png</pixmap> + <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/mask-launcher.png</pixmap> </property> <property name="alignment"> <set>Qt::AlignCenter</set> @@ -308,8 +308,9 @@ </action> </widget> <resources> + <include location="../../../../../data/resources/mainwindow.qrc"/> + <include location="../../../../../data/resources/locale.qrc"/> <include location="../../../../data/resources/mainwindow.qrc"/> - <include location="../../../../data/resources/locale.qrc"/> </resources> <connections/> </ui> |