From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 20 Jun 2019 08:48:59 +0000 (+0200)
Subject: Fix compilation with Qt4
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=c96e8569c70e930b998299c021c1882f50eac963;p=features.git

Fix compilation with Qt4
---

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index c3d9fefdde..21a6948f69 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -980,7 +980,7 @@ GuiDocument::GuiDocument(GuiView & lv)
 	const QStringList utf8_base_encodings = {"utf8", "utf8-plain", "utf8x"};
     for (auto const & i : utf8_base_encodings) {
         langModule->unicodeEncodingCO->addItem(
-			toqstr(encodings.fromLyXName(i.toStdString())->guiName()), i);
+			toqstr(encodings.fromLyXName(fromqstr(i))->guiName()), i);
 	}
 	langModule->unicodeEncodingCO->setItemData(0,
 		"Standard Unicode support by the ``inputenc'' package.",