diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-01-23 09:18:29 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-01-23 19:15:29 +0000 |
| commit | 21dfda65d7aca254637ede42a37d604ba8c21b16 (patch) | |
| tree | bb78a0f7a23000254828b8296ba9c7702e4d4e32 /ui/qt/sctp_assoc_analyse_dialog.ui | |
| parent | d8d2d8e09cdbc6c258ef212cd439c9a4ecf55239 (diff) | |
| download | wireshark-21dfda65d7aca254637ede42a37d604ba8c21b16.tar.gz | |
Qt: Remove windowIcon property from our .ui files.
Setting the windowIcon property in foo.ui means we end up with a
setWindowIcon call in ui_foo.h. Along with setting the window title
bar icon, it also sets the taskbar icon on Windows. A 16x16 PNG gives
us a jaggy taskbar icon. (Windows ICO format is supported via a plugin
which might not be available everywhere, otherwise we could try using
a .ico resource.)
Move the setWindowIcon call from ge990d1b to the top of the MainWindow
constructor and enable it everywhere.
Change-Id: I4e9765200bb3676c4faa8e0ab1505ce02fb64870
Reviewed-on: https://code.wireshark.org/review/6762
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/sctp_assoc_analyse_dialog.ui')
| -rw-r--r-- | ui/qt/sctp_assoc_analyse_dialog.ui | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ui/qt/sctp_assoc_analyse_dialog.ui b/ui/qt/sctp_assoc_analyse_dialog.ui index 9725b3e77a..e16ee1df1c 100644 --- a/ui/qt/sctp_assoc_analyse_dialog.ui +++ b/ui/qt/sctp_assoc_analyse_dialog.ui @@ -19,10 +19,6 @@ <property name="windowTitle"> <string>Wireshark - Analyse Association</string> </property> - <property name="windowIcon"> - <iconset resource="../../image/toolbar.qrc"> - <normaloff>:/menu/help/wsicon16.png</normaloff>:/menu/help/wsicon16.png</iconset> - </property> <property name="locale"> <locale language="English" country="UnitedStates"/> </property> |