Author: mir3x
Date: Mon Aug 18 21:24:57 2014
New Revision: 25940
URL: http://svn.gna.org/viewcvs/freeciv?rev=25940&view=rev
Log:
When porting from qt4 to qt5, fromAscii was replaced by fromLatin,
and it showed many characters incorectly
(FromAscii(x) should be just replaced by QString(x))
*Updated 1 more file
See http://gna.org/patch/?5041
Modified:
branches/S2_5/client/gui-qt/dialogs.cpp
Modified: branches/S2_5/client/gui-qt/dialogs.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/dialogs.cpp?rev=25940&r1=25939&r2=25940&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/dialogs.cpp (original)
+++ branches/S2_5/client/gui-qt/dialogs.cpp Mon Aug 18 21:24:57 2014
@@ -409,9 +409,9 @@
cw->put_to_corner();
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
- qcaption = QString::fromLatin1(caption);
- qheadline = QString::fromLatin1(headline);
- qlines = QString::fromLatin1(lines);
+ qcaption = QString(caption);
+ qheadline = QString(headline);
+ qlines = QString(lines);
#else
qcaption = QString::fromAscii(caption);
qheadline = QString::fromAscii(headline);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
