luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compatibility with Qt 4.6.x on CentOS6

This commit is contained in:
Matthias Köfferlein 2020-11-22 19:53:47 +00:00 committed by root
parent 62d56e3507
commit d5f6b51092
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/klayout.pri
View File

@ -160,10 +160,10 @@ equals(HAVE_QT, "0") {
} else { } else {
DEFINES += HAVE_QT DEFINES += HAVE_QT
QT += core network xml sql widgets QT += core network xml sql
equals(HAVE_QT5, "1") { equals(HAVE_QT5, "1") {
QT += designer printsupport QT += designer printsupport widgets
equals(HAVE_QTBINDINGS, "1") { equals(HAVE_QTBINDINGS, "1") {
QT += multimedia multimediawidgets xmlpatterns svg gui QT += multimedia multimediawidgets xmlpatterns svg gui
} }

8
src/tl/tl/tlHttpStreamQt.cc
View File

@ -71,7 +71,11 @@ AuthenticationHandler::authenticationRequired (QNetworkReply *reply, QAuthentica
// expect UTF-8 today. So do them a favor and encode UTF8 into Latin1, so it gets valid UTF8 when turned into Latin1 ... // expect UTF-8 today. So do them a favor and encode UTF8 into Latin1, so it gets valid UTF8 when turned into Latin1 ...
// We do this for Digest and Basic as they apparently both use Latin 1 encoding. But it's unclear whether all servers // We do this for Digest and Basic as they apparently both use Latin 1 encoding. But it's unclear whether all servers
// expect UTF-8 encoding. // expect UTF-8 encoding.
#if QT_VERSION >= 0x040700
bool is_basic_or_digest = ! auth->option (QString::fromUtf8 ("realm")).isNull (); bool is_basic_or_digest = ! auth->option (QString::fromUtf8 ("realm")).isNull ();
#else
bool is_basic_or_digest = true;
#endif
if (is_basic_or_digest) { if (is_basic_or_digest) {
auth->setPassword (QString::fromLatin1 (passwd.c_str ())); auth->setPassword (QString::fromLatin1 (passwd.c_str ()));
auth->setUser (QString::fromLatin1 (user.c_str ())); auth->setUser (QString::fromLatin1 (user.c_str ()));
@ -98,7 +102,11 @@ AuthenticationHandler::proxyAuthenticationRequired (const QNetworkProxy &proxy,
// expect UTF-8 today. So do them a favor and encode UTF8 into Latin1, so it gets valid UTF8 when turned into Latin1 ... // expect UTF-8 today. So do them a favor and encode UTF8 into Latin1, so it gets valid UTF8 when turned into Latin1 ...
// We do this for Digest and Basic as they apparently both use Latin 1 encoding. But it's unclear whether all servers // We do this for Digest and Basic as they apparently both use Latin 1 encoding. But it's unclear whether all servers
// expect UTF-8 encoding. // expect UTF-8 encoding.
#if QT_VERSION >= 0x040700
bool is_basic_or_digest = ! auth->option (QString::fromUtf8 ("realm")).isNull (); bool is_basic_or_digest = ! auth->option (QString::fromUtf8 ("realm")).isNull ();
#else
bool is_basic_or_digest = true;
#endif
if (is_basic_or_digest) { if (is_basic_or_digest) {
auth->setPassword (QString::fromLatin1 (passwd.c_str ())); auth->setPassword (QString::fromLatin1 (passwd.c_str ()));
auth->setUser (QString::fromLatin1 (user.c_str ())); auth->setUser (QString::fromLatin1 (user.c_str ()));