Merge remote-tracking branch 'origin/5.9' into 5.10

* origin/5.9:

  Fix compilation with namespaces
  Import only available modules
  Update license headers
  Verify that Qtdbus module is available
  tests: add tests.pro for CI
  Doc: Bump version to 5.9.3

Conflicts:
  .qmake.conf

Change-Id: I83f4f8a507586d50423d0a2bb1dd4b69557b38ed

1 files changed, 15 insertions, 6 deletions

diff --git a/src/doc/src/qtdeviceutilities.qdoc b/src/doc/src/qtdeviceutilities.qdoc
index 9e692fe..9c7c5d5 100644
--- a/src/doc/src/qtdeviceutilities.qdoc
+++ b/src/doc/src/qtdeviceutilities.qdoc
@@ -1,18 +1,27 @@
 /****************************************************************************
 **
 ** Copyright (C) 2017 The Qt Company Ltd.
-** All rights reserved.
-** For any questions to The Qt Company, please use the contact form at
-** http://www.qt.io/contact-us
+** Contact: https://www.qt.io/licensing/
 **
-** This file is part of Qt for Device Creation.
+** This file is part of the Device Utilities module of the Qt Toolkit.
 **
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+** $QT_END_LICENSE$
 **
 ****************************************************************************/
 /*!