Skip to content

Qt5 compatibility #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomvanbraeckel wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Qt5 compatibility #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7ce7a7
Change old toAscii() function to toLatin1()
tomvanbraeckel Aug 8, 2018
36841ed
userspace.pro: add required QT printsupport
tomvanbraeckel Aug 8, 2018
b74146b
main.cpp: remove reference to unknown function
tomvanbraeckel Aug 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion userspace/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
MainWindow w;
w.show();

Expand Down
2 changes: 1 addition & 1 deletion userspace/qcustomplot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions userspace/userspace.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#-------------------------------------------------

QT += core gui
QT += printsupport

greaterThan(QT_MAJOR_VERSION, 4): QT += widgets

Expand Down