From 275c5dce335d2b6b5d37715301a16dfbbb8789f2 Mon Sep 17 00:00:00 2001
From: De Stefano <ernesto.destefano@capgemini.com>
Date: Mon, 3 Oct 2016 22:44:49 +0200
Subject: [PATCH] Added GIT_VERSION.

---
 src/qamqpclient.cpp                        | 10 +++++++++-
 src/qamqpclient.h                          |  2 ++
 src/src.pro                                |  7 +++++++
 tests/auto/qamqpclient/tst_qamqpclient.cpp |  3 +++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/qamqpclient.cpp b/src/qamqpclient.cpp
index f98a111..c6ec276 100644
--- a/src/qamqpclient.cpp
+++ b/src/qamqpclient.cpp
@@ -162,7 +162,10 @@ void QAmqpClientPrivate::_q_disconnect()
 // private slots
 void QAmqpClientPrivate::_q_socketConnected()
 {
-    timeout = 0;
+    if(reconnectFixedTimeout == false)
+    {
+        timeout = 0;
+    }
     char header[8] = {'A', 'M', 'Q', 'P', 0, 0, 9, 1};
     socket->write(header, 8);
 }
@@ -887,6 +890,11 @@ void QAmqpClient::setSslConfiguration(const QSslConfiguration &config)
     }
 }
 
+QString QAmqpClient::getGitVersion()
+{
+    return QString(GIT_VERSION);
+}
+
 void QAmqpClient::ignoreSslErrors(const QList<QSslError> &errors)
 {
     Q_D(QAmqpClient);
diff --git a/src/qamqpclient.h b/src/qamqpclient.h
index 395c2a4..1a887db 100644
--- a/src/qamqpclient.h
+++ b/src/qamqpclient.h
@@ -95,6 +95,8 @@ public:
     QSslConfiguration sslConfiguration() const;
     void setSslConfiguration(const QSslConfiguration &config);
 
+    static QString getGitVersion();
+
     // channels
     QAmqpExchange *createExchange(int channelNumber = -1);
     QAmqpExchange *createExchange(const QString &name, int channelNumber = -1);
diff --git a/src/src.pro b/src/src.pro
index 2a5cdd1..4d43ef5 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -31,6 +31,13 @@ greaterThan(NEED_GCOV_SUPPORT, 0) {
     }
 }
 
+#Define GIT Macros
+GIT_VERSION = $$system(git describe --long --dirty)
+DEFINES += GIT_VERSION=\\\"$$GIT_VERSION\\\"
+
+GIT_TAG = $$system(git describe --abbrev=0)
+VERSION = $$replace(GIT_TAG, v,)
+
 PRIVATE_HEADERS += \
     qamqpchannel_p.h \
     qamqpchannelhash_p.h \
diff --git a/tests/auto/qamqpclient/tst_qamqpclient.cpp b/tests/auto/qamqpclient/tst_qamqpclient.cpp
index ebeca0f..5efb2b4 100644
--- a/tests/auto/qamqpclient/tst_qamqpclient.cpp
+++ b/tests/auto/qamqpclient/tst_qamqpclient.cpp
@@ -160,6 +160,9 @@ void tst_QAMQPClient::autoReconnectTimeout()
     QVERIFY(waitForSignal(&client, SIGNAL(connected()), 60));
     qDebug() <<"connected" ;
 
+    QVERIFY(waitForSignal(&client, SIGNAL(disconnected()), 60));
+    QProcess::execute("rabbitmqctl", QStringList() << "start_app");
+    QVERIFY(waitForSignal(&client, SIGNAL(connected()), 60));
 }
 
 void tst_QAMQPClient::tune()