anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 14:30:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not try to se the icon under Qt/Mac

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10477 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2005-09-22 08:33:19 +00:00
parent 04a52dc7bc
commit 27195721f0
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,7 @@
2005-09-22 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* QtView.C (QtView): do not try to se the icon under Qt/Mac.
2005-09-19 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* QGraphics.C (update_contents): fix compiler warning.

5
src/frontends/qt2/QtView.C
View File

@ -67,10 +67,13 @@ QtView::QtView(unsigned int width, unsigned int height)
view_state_changed.connect(boost::bind(&QtView::update_view_state, this));
connect(&statusbar_timer_, SIGNAL(timeout()), this, SLOT(update_view_state_qt()));
// assign an icon to main form
#ifndef Q_WS_MACX
// assign an icon to main form. We do not do it under Qt/Mac,
// since the icon is provided in the application bundle.
string const iconname = LibFileSearch("images", "lyx", "xpm");
if (!iconname.empty())
setIcon(QPixmap(toqstr(iconname)));
#endif
// make sure the buttons are disabled if needed
updateToolbars();