From 5b77e9b298cfd45473d9434d8fde04d2537fffbb Mon Sep 17 00:00:00 2001
From: Ilya Kitaev <mbg033@gmail.com>
Date: Wed, 23 Aug 2017 22:06:38 +0300
Subject: [PATCH] Replaced QGCRingBuffer with QRingBuffer (from Qt)

Conflicts:
	libs/mavlink/include/mavlink/v1.0
	mavlink_generator
	src/GPS/Drivers
---
 libs/qtandroidserialport/src/qserialport_p.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/libs/qtandroidserialport/src/qserialport_p.h b/libs/qtandroidserialport/src/qserialport_p.h
index 7bbdaaa7c..612a75544 100644
--- a/libs/qtandroidserialport/src/qserialport_p.h
+++ b/libs/qtandroidserialport/src/qserialport_p.h
@@ -48,9 +48,14 @@
 //
 
 #include "qserialport.h"
+#include "private/qringbuffer_p.h"
+
+
+#include <QDebug>
 
 QT_BEGIN_NAMESPACE
 
+  
 class QGCRingBuffer
 {
 public:
@@ -318,8 +323,8 @@ public:
     int timeoutValue(int msecs, int elapsed);
 
     qint64 readBufferMaxSize;
-    QGCRingBuffer readBuffer;
-    QGCRingBuffer writeBuffer;
+    QRingBuffer readBuffer;
+    QRingBuffer writeBuffer;
     QSerialPort::SerialPortError error;
     QString systemLocation;
     qint32 inputBaudRate;
-- 
2.22.0