From fca2ae25c4b29fe662f6a882cee2e6d578f58577 Mon Sep 17 00:00:00 2001 From: codestation Date: Sat, 11 Jan 2014 17:02:42 -0430 Subject: [PATCH] Set default CString codec to UTF-8 in Qt4 --- src/forms/progressform.cpp | 2 +- src/main.cpp | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/forms/progressform.cpp b/src/forms/progressform.cpp index 88468bf..aa0160d 100644 --- a/src/forms/progressform.cpp +++ b/src/forms/progressform.cpp @@ -31,7 +31,7 @@ ProgressForm::ProgressForm(QWidget *parent) : move(QApplication::desktop()->screen()->rect().center() - rect().center()); setFixedSize(size()); setWindowFlags(Qt::CustomizeWindowHint | Qt::WindowTitleHint); - connect(ui->cancelButton, SIGNAL(clicked()), this, SLOT(cancelConfirm())); + connect(ui->cancelButton, SIGNAL(clicked()), this, SLOT(cancelConfirm())); } ProgressForm::~ProgressForm() diff --git a/src/main.cpp b/src/main.cpp index 2e5aaad..a4c5586 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -72,6 +73,10 @@ int main(int argc, char *argv[]) #endif } +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) + QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); +#endif + qDebug("Starting QCMA %s", QCMA_VER); QTranslator translator;