From a7ce7a71b81c11489373d6409d492033ae53cb83 Mon Sep 17 00:00:00 2001 From: Tom Van Braeckel Date: Wed, 8 Aug 2018 10:29:06 +0200 Subject: [PATCH 1/3] Change old toAscii() function to toLatin1() --- userspace/qcustomplot.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userspace/qcustomplot.cpp b/userspace/qcustomplot.cpp index 09b6a64..59a5f75 100644 --- a/userspace/qcustomplot.cpp +++ b/userspace/qcustomplot.cpp @@ -4084,7 +4084,7 @@ void QCPAxis::setNumberFormat(const QString &formatCode) QString allowedFormatChars = "eEfgG"; if (allowedFormatChars.contains(formatCode.at(0))) { - mNumberFormatChar = formatCode.at(0).toAscii(); + mNumberFormatChar = formatCode.at(0).toLatin1(); } else { qDebug() << Q_FUNC_INFO << "Invalid number format code (first char not in 'eEfgG'):" << formatCode; From 36841ed377487cca7037eae6e3980b3816a75fe1 Mon Sep 17 00:00:00 2001 From: Tom Van Braeckel Date: Wed, 8 Aug 2018 10:29:47 +0200 Subject: [PATCH 2/3] userspace.pro: add required QT printsupport --- userspace/userspace.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/userspace/userspace.pro b/userspace/userspace.pro index d5d8270..2c5df21 100644 --- a/userspace/userspace.pro +++ b/userspace/userspace.pro @@ -5,6 +5,7 @@ #------------------------------------------------- QT += core gui +QT += printsupport greaterThan(QT_MAJOR_VERSION, 4): QT += widgets From b74146bf63a61323f967abc14fb8fc46aaf81e0f Mon Sep 17 00:00:00 2001 From: Tom Van Braeckel Date: Wed, 8 Aug 2018 10:30:21 +0200 Subject: [PATCH 3/3] main.cpp: remove reference to unknown function --- userspace/main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/userspace/main.cpp b/userspace/main.cpp index 1941cbb..572dc8e 100644 --- a/userspace/main.cpp +++ b/userspace/main.cpp @@ -5,7 +5,6 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); MainWindow w; w.show();