fixed compilation in MacOSX Mavericks (Qt4 and Qt5)

This commit is contained in:
Luis Ángel San Martín
2013-11-23 06:32:50 -08:00
parent 7392e55597
commit 5a5c118b83
7 changed files with 20 additions and 9 deletions

View File

@ -52,7 +52,7 @@ void HttpConnectionHandler::run() {
}
void HttpConnectionHandler::handleConnection(int socketDescriptor) {
void HttpConnectionHandler::handleConnection(tSocketDescriptor socketDescriptor) {
qDebug("HttpConnectionHandler (%p): handle new connection", this);
busy = true;
Q_ASSERT(socket.isOpen()==false); // if not, then the handler is already busy

View File

@ -56,7 +56,7 @@ QString LogMessage::toString(const QString& msgFormat, const QString& timestampF
decorated.replace("{line}",QString::number(line));
QString threadId;
threadId.setNum((unsigned int)QThread::currentThreadId()); // change to (qint64) for 64bit Mac OS
threadId.setNum((quint64)QThread::currentThreadId()); // change to (qint64) for 64bit Mac OS
decorated.replace("{thread}",threadId);
// Fill in variables