summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2014-01-15 10:01:29 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-15 16:35:35 +0100
commit6e824063d00031f8d069e59e2087b155a89b7fe3 (patch)
tree01893be109a2b06897e0f7be698f9889230be894
parent005b556489d77ef566dcffcce9d7b4a085dc3959 (diff)
Remove byte order marker which causes problems with older compilers
Task-number: QTBUG-36187 Change-Id: Ie20ec6e802f44a6fa6757b914289736c4421138b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
-rw-r--r--dist/changes-5.2.14
-rw-r--r--src/plugins/position/positionpoll/qgeoareamonitor_polling.h2
2 files changed, 5 insertions, 1 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