summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2017-10-23 19:19:53 (GMT)
committerDenis Shienkov <denis.shienkov@gmail.com>2017-10-25 10:27:28 (GMT)
commit3e0d23ff3533fd11e0f5b680e1943e457468310c (patch)
tree127bd643cbc49a8c9178602d8f058684287845d8
parentd9030bb9da8d7b472f86513e8695c442a43f19e7 (diff)
downloadqtserialport-3e0d23ff3533fd11e0f5b680e1943e457468310c.tar.gz
Fix order for some includesv5.10.0-beta3
Qt includes should be added before platform-specific includes. Change-Id: Ie8bcf306c9e0f3d5d719ee57bcddc8bd2967f5cb Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
-rw-r--r--src/serialport/qserialport_unix.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp
index 5d35446..05db317 100644
--- a/src/serialport/qserialport_unix.cpp
+++ b/src/serialport/qserialport_unix.cpp
@@ -42,10 +42,17 @@
#include "qserialport_p.h"
#include "qserialportinfo_p.h"
+#include <QtCore/qelapsedtimer.h>
+#include <QtCore/qmap.h>
+#include <QtCore/qsocketnotifier.h>
+#include <QtCore/qstandardpaths.h>
+
+#include <private/qcore_unix_p.h>
+
#include <errno.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/time.h>
#include <unistd.h>
#ifdef Q_OS_OSX
@@ -93,13 +100,6 @@ struct termios2 {
#endif
-#include <private/qcore_unix_p.h>
-
-#include <QtCore/qelapsedtimer.h>
-#include <QtCore/qsocketnotifier.h>
-#include <QtCore/qmap.h>
-#include <QtCore/qstandardpaths.h>
-
QT_BEGIN_NAMESPACE
QString serialPortLockFilePath(const QString &portName)