From 27195721f03b37e3a4279cff19b9db8b82e73faa Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Thu, 22 Sep 2005 08:33:19 +0000 Subject: [PATCH] do not try to se the icon under Qt/Mac git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10477 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 4 ++++ src/frontends/qt2/QtView.C | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 9fdea5ea0c..54f9ac0218 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2005-09-22 Jean-Marc Lasgouttes + + * QtView.C (QtView): do not try to se the icon under Qt/Mac. + 2005-09-19 Jean-Marc Lasgouttes * QGraphics.C (update_contents): fix compiler warning. diff --git a/src/frontends/qt2/QtView.C b/src/frontends/qt2/QtView.C index ca71adeee9..7f7e98c490 100644 --- a/src/frontends/qt2/QtView.C +++ b/src/frontends/qt2/QtView.C @@ -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();