Qt5: Fix compilation errors with Qt 5.5.0 beta

This commit is contained in:
Abs62 2015-05-20 17:52:33 +03:00
parent c3987668f7
commit 867306f326
3 changed files with 14 additions and 0 deletions

12
main.cc
View file

@ -86,6 +86,15 @@ void gdMessageHandler( QtMsgType type, const char *msg )
else
fprintf(stderr, "Fatal: %s\n", msg);
abort();
#if QT_VERSION >= QT_VERSION_CHECK( 5, 5, 0 )
case QtInfoMsg:
if( logFile.isOpen() )
message.insert( 0, "Info: " );
else
fprintf(stderr, "Info: %s\n", msg);
break;
#endif
}
if( logFile.isOpen() )
@ -316,5 +325,8 @@ int main( int argc, char ** argv )
app.removeDataCommiter( m );
if( logFile.isOpen() )
logFile.close();
return r;
}

View file

@ -33,6 +33,7 @@
#include <QRegExp>
#include <QDomDocument>
#include <QTextDocumentFragment>
#include <QDataStream>
#include <QDebug>

View file

@ -42,6 +42,7 @@
#include "qtlocalpeer.h"
#include <QCoreApplication>
#include <QTime>
#include <QDataStream>
#if defined(Q_OS_WIN)
#include <QLibrary>