Merge remote-tracking branch 'origin/3.3'

Conflicts:
	src/plugins/cppeditor/cppdocumentationcommenthelper.cpp

Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d

src/plugins/projectexplorer/abi.cpp

@@ -746,6 +746,16 @@ Abi Abi::hostAbi()
     os = MacOS;
     subos = GenericMacFlavor;
     format = MachOFormat;
+#elif defined (Q_OS_BSD4)
+    os = BsdOS;
+# if defined (Q_OS_FREEBSD)
+    subos = FreeBsdFlavor;
+# elif defined (Q_OS_NETBSD)
+    subos = NetBsdFlavor;
+# elif defined (Q_OS_OPENBSD)
+    subos = OpenBsdFlavor;
+# endif
+    format = ElfFormat;
 #endif
 
     const Abi result(arch, os, subos, format, QSysInfo::WordSize);