mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 13:18:28 +00:00
compilation warning: comparison of two char *
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28510 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
29117ed909
commit
22e13587b3
@ -98,7 +98,7 @@ static QString version()
|
||||
QString loc_release_date =
|
||||
loc.toString(release_date(), QLocale::LongFormat);
|
||||
if (loc_release_date.isEmpty()) {
|
||||
if (lyx_release_date == "not released yet")
|
||||
if (QString(lyx_release_date) == "not released yet")
|
||||
loc_release_date = qt_("not released yet");
|
||||
else
|
||||
loc_release_date = toqstr(lyx_release_date);
|
||||
|
@ -27,7 +27,7 @@ LengthCombo::LengthCombo(QWidget * parent)
|
||||
for (int i = 0; i < lyx::num_units; i++) {
|
||||
// mu does not make sense usually
|
||||
// so it must be added manually, if needed
|
||||
if (lyx::unit_name[i] == "mu")
|
||||
if (QString(lyx::unit_name[i]) == "mu")
|
||||
continue;
|
||||
QComboBox::addItem(lyx::qt_(lyx::unit_name_gui[i]),
|
||||
lyx::toqstr(lyx::unit_name[i]));
|
||||
|
Loading…
Reference in New Issue
Block a user