anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-05 17:09:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

compile without STL compatibility; fix compile error

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@10289 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2005-07-17 14:37:52 +00:00
parent 8f23b05fda
commit 65f949dc76
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/ChangeLog
View File

@ -1,5 +1,7 @@
2005-07-17 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* qt.m4 (QT_DO_IT_ALL): define QT_NO_STL.
* configure.in (VERSION):
* configure.ac (VERSION): switch to 1.3.7cvs

4
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,7 @@
2005-07-17 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* QPrefs.C (setComboxFont): use fromqstr.
2005-07-12 Angus Leeming <leeming@lyx.org>
* lyx_gui.C (LQApplication d-tor): unlock the mutex if the Qt library

2
src/frontends/qt2/QPrefs.C
View File

@ -347,7 +347,7 @@ void setComboxFont(QComboBox * cb, string const & family,
string const & default_font_name = tmp.first;
for (int i = cb->count() - 1; i >= 0; --i) {
if (cb->text(i) == default_font_name) {
if (fromqstr(cb->text(i)) == default_font_name) {
cb->setCurrentItem(i);
return;
}