Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1

Conflicts:
	.qmake.conf

Change-Id: I0dcaa0ea10fa9ca4a04f5c3837ea70028fc9c0b8

1 files changed, 7 insertions, 4 deletions

diff --git a/src/serialport/serialport-lib.pri b/src/serialport/serialport-lib.pri
index c3b00eaf..7179beae 100644
--- a/src/serialport/serialport-lib.pri
+++ b/src/serialport/serialport-lib.pri
@@ -37,14 +37,17 @@ unix {
     SOURCES += \
         $$PWD/qserialport_unix.cpp
 
-    !osx {
-        SOURCES += \
-            $$PWD/qserialportinfo_unix.cpp
-    } else {
+    osx {
         SOURCES += \
             $$PWD/qserialportinfo_osx.cpp
 
         LIBS_PRIVATE += -framework IOKit -framework CoreFoundation
+    } else:freebsd {
+        SOURCES += \
+            $$PWD/qserialportinfo_freebsd.cpp
+    } else {
+        SOURCES += \
+            $$PWD/qserialportinfo_unix.cpp
     }
 }