From 966980b6d3feeb86f4b08c15cd994ab2707a004d Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Thu, 10 Oct 2013 02:32:54 +1000
Subject: [PATCH] QExtSerialPort qt5 library name fix, fix some more warnings

---
 src/SleepLib/calcs.cpp   | 10 +++++-----
 src/SleepLib/session.cpp |  4 ++--
 src/src.pro              | 12 +++++++++---
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/SleepLib/calcs.cpp b/src/SleepLib/calcs.cpp
index d2b4cc25..9a67b7cc 100644
--- a/src/SleepLib/calcs.cpp
+++ b/src/SleepLib/calcs.cpp
@@ -327,7 +327,7 @@ void FlowParser::calc(bool calcResp, bool calcTv, bool calcTi, bool calcTe, bool
     /////////////////////////////////////////////////////////////////////////////////
     // Respiratory Rate setup
     /////////////////////////////////////////////////////////////////////////////////
-    EventDataType minrr,maxrr;
+    EventDataType minrr=0,maxrr=0;
     EventList * RR=NULL;
     quint32 * rr_tptr=NULL;
     EventStoreType * rr_dptr=NULL;
@@ -368,11 +368,11 @@ void FlowParser::calc(bool calcResp, bool calcTv, bool calcTi, bool calcTe, bool
     /////////////////////////////////////////////////////////////////////////////////
     // Tidal Volume setup
     /////////////////////////////////////////////////////////////////////////////////
-    EventList * TV;
-    EventDataType mintv, maxtv, tv;
+    EventList * TV=NULL;
+    EventDataType mintv=0, maxtv=0, tv=0;
     double val1, val2;
-    quint32 * tv_tptr;
-    EventStoreType * tv_dptr;
+    quint32 * tv_tptr=NULL;
+    EventStoreType * tv_dptr=NULL;
     int tv_count=0;
     if (calcTv) {
         TV=m_session->AddEventList(CPAP_TidalVolume,EVL_Event);
diff --git a/src/SleepLib/session.cpp b/src/SleepLib/session.cpp
index 7702f67f..5197cc14 100644
--- a/src/SleepLib/session.cpp
+++ b/src/SleepLib/session.cpp
@@ -1044,7 +1044,7 @@ double Session::rangeSum(ChannelID id, qint64 first,qint64 last)
     qint64 t,start;
     EventStoreType * dptr, * eptr;
     quint32 * tptr;
-    int cnt,idx;
+    int cnt,idx=0;
 
     qint64 rate;
     for (int i=0;i < evec.size();i++) {
@@ -1338,7 +1338,7 @@ EventDataType Session::percentile(ChannelID id,EventDataType percent)
 
     EventStoreType * dptr, * sptr, *eptr;
 
-    int tt=0,cnt;
+    int tt=0,cnt=0;
     for (int i=0;i<size;i++) {
         EventList & ev=*evec[i];
         cnt=ev.count();
diff --git a/src/src.pro b/src/src.pro
index 7a46797d..883625d1 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -230,9 +230,15 @@ else:unix: LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/ -lquazip
 INCLUDEPATH += $$PWD/../3rdparty/quazip
 DEPENDPATH += $$PWD/../3rdparty/quazip
 
-win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lqextserialport
-else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lqextserialport
-else:unix: LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/ -lqextserialport
+greaterThan(QT_MAJOR_VERSION,4) {
+    win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lQt5ExtSerialPort1
+    else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lQt5ExtSerialPortd1
+    else:unix: LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/ -lqextserialport
+} else {
+    win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lqextserialport
+    else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lqextserialport
+    else:unix: LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/ -lqextserialport
+}
 
 INCLUDEPATH += $$PWD/../3rdparty/qextserialport
 DEPENDPATH += $$PWD/../3rdparty/qextserialport