mirror of
https://github.com/YACReader/yacreader
synced 2025-07-21 06:24:39 -04:00
Fixed YACReaderLibrary compilation under Qt5 (untested at runtime)
TODO fix YACReader compilation under Qt5 update poppler update server
This commit is contained in:
@ -9,6 +9,7 @@
|
||||
#include <QMutex>
|
||||
#include <QDateTime>
|
||||
#include <QThread>
|
||||
#include <QtGlobal>
|
||||
|
||||
Logger* Logger::defaultLogger=0;
|
||||
|
||||
@ -72,7 +73,12 @@ void Logger::msgHandler(const QtMsgType type, const char* message) {
|
||||
|
||||
Logger::~Logger() {
|
||||
if (defaultLogger==this) {
|
||||
qInstallMsgHandler(0);
|
||||
#if QT_VERSION >= 0x050100
|
||||
qInstallMessageHandler(0);
|
||||
#else
|
||||
qInstallMsgHandler(0);
|
||||
#endif
|
||||
|
||||
defaultLogger=0;
|
||||
}
|
||||
}
|
||||
@ -86,7 +92,11 @@ void Logger::write(const LogMessage* logMessage) {
|
||||
|
||||
void Logger::installMsgHandler() {
|
||||
defaultLogger=this;
|
||||
qInstallMsgHandler(msgHandler);
|
||||
#if QT_VERSION >= 0x050100
|
||||
//qInstallMessageHandler(msgHandler); TODO Qt5
|
||||
#else
|
||||
qInstallMsgHandler(msgHandler);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user