On Wed, Mar 18, 2009 at 11:17:37PM -0000, for...@lyx.org wrote: > Author: forenr > Date: Thu Mar 19 00:17:33 2009 > New Revision: 28862 > > URL: http://www.lyx.org/trac/changeset/28862 > Log: > Fix display of release date with Qt 4.2. > In Qt 4.2, QLocale::toString(QDate, ...) returns an invalid but not empty date > when QDate is invalid. So, check whether QDate is valid before conversion.
Jürgen, OK for branch? > Modified: > lyx-devel/trunk/src/frontends/qt4/GuiAbout.cpp > > Modified: lyx-devel/trunk/src/frontends/qt4/GuiAbout.cpp > URL: > http://www.lyx.org/trac/file/lyx-devel/trunk/src/frontends/qt4/GuiAbout.cpp?rev=28862 > ============================================================================== > --- lyx-devel/trunk/src/frontends/qt4/GuiAbout.cpp (original) > +++ lyx-devel/trunk/src/frontends/qt4/GuiAbout.cpp Thu Mar 19 00:17:33 2009 > @@ -94,10 +94,12 @@ > > static QString version() > { > - QLocale loc; > - QString loc_release_date = > - loc.toString(release_date(), QLocale::LongFormat); > - if (loc_release_date.isEmpty()) { > + QString loc_release_date; > + QDate date = release_date(); > + if (date.isValid()) { > + QLocale loc; > + loc_release_date = loc.toString(date, QLocale::LongFormat); > + } else { > if (QString(lyx_release_date) == "not released yet") > loc_release_date = qt_("not released yet"); > else > > -- Enrico
