Merge branch 'release' into stable

Change-Id: I82706858585256cbb23278250d870c54d6c4b085

3 files changed, 17 insertions, 6 deletions

diff --git a/dist/changes-5.2.1 b/dist/changes-5.2.1
index 28ba3bca..a3e7058c 100644
--- a/dist/changes-5.2.1
+++ b/dist/changes-5.2.1
@@ -25,6 +25,10 @@ General Improvements
  - [QTBUG-34910]
   * Fix too long weather status string in weatherinfo example (UI change).
 
+ - [QTBUG-36187]
+  * Byte order marker removed from positionpoll plugin which caused compile
+  errors on some older compilers.
+
  - Fix make install rules for all examples.
 
  - declarative_core unit test was fixed and re-enabled.
diff --git a/src/plugins/position/positionpoll/qgeoareamonitor_polling.h b/src/plugins/position/positionpoll/qgeoareamonitor_polling.h
index f25cd685..41e15d30 100644
--- a/src/plugins/position/positionpoll/qgeoareamonitor_polling.h
+++ b/src/plugins/position/positionpoll/qgeoareamonitor_polling.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.cpp b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.cpp
index be8dfa78..6bf85173 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.cpp
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.cpp
@@ -86,14 +86,21 @@ QNmeaPositionInfoSourceProxy *QNmeaPositionInfoSourceProxyFactory::createProxy(Q
 {
     QTcpSocket *client = new QTcpSocket;
     client->connectToHost(m_server->serverAddress(), m_server->serverPort());
-    //qDebug() << "listening on" << m_server->serverAddress() << m_server->serverPort();
-    bool b = m_server->waitForNewConnection(5000);
-    Q_ASSERT(b);
+    qDebug() << "listening on" << m_server->serverAddress() << m_server->serverPort();
+    bool b = m_server->waitForNewConnection(15000);
+    if (!b)
+        qWarning() << "Server didin't receive new connection";
     b = client->waitForConnected();
-    Q_ASSERT(b);
+    if (!b)
+        qWarning() << "Client could not connect to server";
 
     //QNmeaPositionInfoSource *source = new QNmeaPositionInfoSource(m_mode);
-    source->setDevice(m_server->nextPendingConnection());
+    QIODevice *device = m_server->nextPendingConnection();
+    if (!device)
+        qWarning() << "Missing pending connection. Test is going to fail.";
+    else
+        qWarning() << "Received pending connection:" << device << b;
+    source->setDevice(device);
     Q_ASSERT(source->device() != 0);
     QNmeaPositionInfoSourceProxy *proxy = new QNmeaPositionInfoSourceProxy(source, client);
     proxy->setParent(source);