On Wed, Sep 13, 2006 at 12:42:01PM +0200, Jean-Marc Lasgouttes wrote:
> >>>>> "Rainer" == Rainer Dorsch <[EMAIL PROTECTED]> writes:
>
> Rainer> So that means lyx 1.4.2 does not support qt 3.0.x, right?
>
> Rainer> If yes, someone should update the README for 1.4.3. It says
> Rainer> that even QT2 might be supported though untested. This would
> Rainer> mean at least qt>=3.1 is required.
>
> I think we should support qt3.0 if possible. Concerning qt2, there is
> indeed no reason to support it.
Jean-Marc,
according to Rainer Dorsch the attached patch let LyX compile again
with qt3.0. Please let me know if I can apply it to 1.4.x.
Then there's an issue with the required minimum version of python
but I think that Josè can handle it.
--
Enrico
Index: src/frontends/qt2/qt_helpers.C
===================================================================
--- src/frontends/qt2/qt_helpers.C (revision 14992)
+++ src/frontends/qt2/qt_helpers.C (working copy)
@@ -116,7 +116,7 @@ void lengthToWidgets(QLineEdit * input,
QString const toqstr(char const * str)
{
- return QString::fromAscii(str);
+ return QString::fromLatin1(str);
}
Index: src/frontends/qt2/ChangeLog
===================================================================
--- src/frontends/qt2/ChangeLog (revision 14992)
+++ src/frontends/qt2/ChangeLog (working copy)
@@ -1,3 +1,11 @@
+2006-09-14 Enrico Forestieri <[EMAIL PROTECTED]>
+
+ * qt_helpers.C (toqstr): Qt 3.0 doesn't have fromAscii, so replace
+ it with fromLatin1.
+
+ * QLyXKeySym.C (initEncodings): use setCodecForCStrings only with
+ Qt 3.1 and higher.
+
2006-08-19 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* QContentPane.C (focusInEvent, focusOutEvent): new methods;
Index: src/frontends/qt2/QLyXKeySym.C
===================================================================
--- src/frontends/qt2/QLyXKeySym.C (revision 14992)
+++ src/frontends/qt2/QLyXKeySym.C (working copy)
@@ -130,7 +130,9 @@ void initEncodings()
QTextCodec * defaultCodec = encoding_map[s];
encoding_map[""] = defaultCodec;
+#if QT_VERSION >= 0x030100
QTextCodec::setCodecForCStrings(defaultCodec);
+#endif
}
