From c384cc2bdb47e995114cd65d9f0a79053663214b Mon Sep 17 00:00:00 2001 From: Kate Alhola Date: Mon, 11 Jun 2012 18:21:33 +0300 Subject: [PATCH] Qt 4.8 #if added --- mardrone/dronelib/dronecontrol.cpp | 5 +++-- mardrone/dronelib/video.cpp | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mardrone/dronelib/dronecontrol.cpp b/mardrone/dronelib/dronecontrol.cpp index 2a52f0d..b811f51 100644 --- a/mardrone/dronelib/dronecontrol.cpp +++ b/mardrone/dronelib/dronecontrol.cpp @@ -427,11 +427,12 @@ DroneThread::DroneThread(DroneControl *parentp,QHostAddress host) imreq.imr_multiaddr.s_addr=inet_addr("224.1.1.1"); imreq.imr_interface.s_addr=inet_addr(my_ip.toAscii()); setsockopt(navSock->socketDescriptor(),IPPROTO_IP,IP_ADD_MEMBERSHIP,&imreq,sizeof(imreq)); -//#else + +#if QT_VERSION >= 0x040800 // Qt 4.8 if(!navSock->joinMulticastGroup(QHostAddress("224.1.1.1"))) qDebug() << "can't join multicast Group 224.1.1.1" << navSock->errorString(); -//#endif +#endif cmdSock=new QUdpSocket(); cmdSock->bind(QHostAddress::Any,5556); droneHost=host; diff --git a/mardrone/dronelib/video.cpp b/mardrone/dronelib/video.cpp index a4ec155..0580a6d 100644 --- a/mardrone/dronelib/video.cpp +++ b/mardrone/dronelib/video.cpp @@ -135,11 +135,11 @@ VideoThread::VideoThread(DroneVideo *parentp,QHostAddress host,QImage *_image) imreq.imr_multiaddr.s_addr=inet_addr("224.1.1.1"); imreq.imr_interface.s_addr=inet_addr(my_ip.toAscii()); setsockopt(videoSock->socketDescriptor(),IPPROTO_IP,IP_ADD_MEMBERSHIP,&imreq,sizeof(imreq)); -//#else +#if QT_VERSION >= 0x040800 // Qt 4.8 if(!videoSock->joinMulticastGroup(QHostAddress("224.1.1.1"))) qDebug() << "VideoThread::VideoThread can't join multicast Group 224.1.1.1" << videoSock->errorString(); -//#endif +#endif droneHost=host; videoRec=FALSE; videoFile=NULL; -- 1.7.9.5