diff options
| author | dos-reis <gdr@axiomatics.org> | 2014-10-04 00:50:57 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2014-10-04 00:50:57 +0000 |
| commit | 564aff97f80abac84be64552f5238903cb126c33 (patch) | |
| tree | 0ba82ae0f8e4249eb1dc37a7662219523f5d3cd4 /src | |
| parent | 33259a6291be67fdc2545024f8fd5ff9603fd8dd (diff) | |
| download | open-axiom-564aff97f80abac84be64552f5238903cb126c33.tar.gz | |
Fix QT5 toAscii() compatibility issue.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/Makefile.in | 2 | ||||
| -rw-r--r-- | src/algebra/Makefile.in | 2 | ||||
| -rw-r--r-- | src/boot/Makefile.in | 2 | ||||
| -rw-r--r-- | src/gui/server.cc | 4 | ||||
| -rw-r--r-- | src/io/Makefile.in | 2 | ||||
| -rw-r--r-- | src/rt/Makefile.in | 2 | ||||
| -rw-r--r-- | src/syntax/Makefile.in | 2 |
8 files changed, 13 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3a792c7f..0a1f925a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-10-03 Gabriel Dos Reis <gdr@integrable-solutions.net> + + * gui/server.cc (Server::input): Replace toAscii() with toLatin1() + for Qt5-compat. + 2014-09-16 Gabriel Dos Reis <gdr@integrable-solutions.net> * rt/vm.cc (VM::Environment::Environment): Define. diff --git a/src/Makefile.in b/src/Makefile.in index 28aee554..0c6143c5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index 25ae6f47..5e4c5b0a 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/src/boot/Makefile.in b/src/boot/Makefile.in index c55e08d3..c5f9a06e 100644 --- a/src/boot/Makefile.in +++ b/src/boot/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/src/gui/server.cc b/src/gui/server.cc index 7af0aa7c..4095fa71 100644 --- a/src/gui/server.cc +++ b/src/gui/server.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2013, Gabriel Dos Reis. +// Copyright (C) 2013-2014, Gabriel Dos Reis. // All rights reserved. // Written by Gabriel Dos Reis. // @@ -53,7 +53,7 @@ namespace OpenAxiom { void Server::input(const QString& s) { - write(s.toAscii()); + write(s.toLatin1()); write("\n"); } diff --git a/src/io/Makefile.in b/src/io/Makefile.in index 3118c271..cc7e0232 100644 --- a/src/io/Makefile.in +++ b/src/io/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/src/rt/Makefile.in b/src/rt/Makefile.in index a1361602..f1dfdf20 100644 --- a/src/rt/Makefile.in +++ b/src/rt/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/src/syntax/Makefile.in b/src/syntax/Makefile.in index 57a44ec7..a22f7613 100644 --- a/src/syntax/Makefile.in +++ b/src/syntax/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. |