From 37ef04812b9571a59eca81102a6df6928532915f Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Thu, 19 Aug 2004 06:30:43 +0000 Subject: [PATCH] make the custom bullet fix compile on SuSE 9.0 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8958 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/BulletsModule.C | 2 +- src/frontends/qt2/ChangeLog | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/frontends/qt2/BulletsModule.C b/src/frontends/qt2/BulletsModule.C index 5ca95d74ff..8e8cfd29fc 100644 --- a/src/frontends/qt2/BulletsModule.C +++ b/src/frontends/qt2/BulletsModule.C @@ -217,7 +217,7 @@ void BulletsModule::setBullet(QPushButton * pb, QComboBox * co, Bullet const & b { if (b.getFont() == -1) { pb->setPixmap(QPixmap()); - pb->setText(b.getText()); + pb->setText(toqstr(b.getText())); } else { pb->setPixmap(getPixmap(b.getFont(), b.getCharacter())); } diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 16ba235948..e4c95ccf72 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,8 @@ +2004-08-19 Georg Baum + + * BulletsModule.C (setBullet): use toqstr() for a string passed to + qt, otherwise it won't compile on SuSE 9.0 + 2004-08-18 Lars Gullik Bjonnes * Some pch work. -- 2.39.5