mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-20 22:14:41 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed YACReader compilation under Qt5 (YACReader-YACReaderLibrary communication is broken at runtime)

Browse Source
This commit is contained in:
Luis Ángel San Martín
2013-10-09 18:44:46 +02:00
parent d5a35de96c
commit b1d3bbb584
11 changed files with 83 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
YACReaderLibrary/YACReaderLibrary.pro
View File

@ -3,7 +3,7 @@
######################################################################
TEMPLATE = app
TARGET =
TARGET = YACReaderLibrary
DEPENDPATH += .
INCLUDEPATH += .
INCLUDEPATH += ../common \
@ -143,12 +143,11 @@ TRANSLATIONS = yacreaderlibrary_es.ts \
yacreaderlibrary_fr.ts \
yacreaderlibrary_nl.ts \
yacreaderlibrary_source.ts
contains(QT_MINOR_VERSION, 5) {
Release:DESTDIR = ../release5
Debug:DESTDIR = ../debug5
}
!contains(QT_MINOR_VERSION, 5)
{
Release:DESTDIR = ../release
Debug:DESTDIR = ../debug
isEqual(QT_MAJOR_VERSION, 5) {
Release:DESTDIR = ../release5
Debug:DESTDIR = ../debug5
} else {
Release:DESTDIR = ../release
Debug:DESTDIR = ../debug
}

4
YACReaderLibrary/server/lib/bfLogging/logger.cpp
View File

@ -73,7 +73,7 @@ void Logger::msgHandler(const QtMsgType type, const char* message) {
Logger::~Logger() {
if (defaultLogger==this) {
#if QT_VERSION >= 0x050100
#if QT_VERSION >= 0x050000
qInstallMessageHandler(0);
#else
qInstallMsgHandler(0);
@ -92,7 +92,7 @@ void Logger::write(const LogMessage* logMessage) {
void Logger::installMsgHandler() {
defaultLogger=this;
#if QT_VERSION >= 0x050100
#if QT_VERSION >= 0x050000
//qInstallMessageHandler(msgHandler); TODO Qt5
#else
qInstallMsgHandler(msgHandler);