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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 9fdea5ea0c0c4337b144fd18dedb34682abf1eed..54f9ac021877eda6dcc5b04c9ac90653cb511798 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -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.

diff --git a/src/frontends/qt2/QtView.C b/src/frontends/qt2/QtView.C
index ca71adeee967c6f2907a4a2d3590cd60ad6dc199..7f7e98c490fa7474f6fcc2c70492cca5f0f27d25 100644 (file)
--- 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();