diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-12-19 11:53:05 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-12-19 11:57:48 +0200 |
commit | 44d7f1865af8a8b4491f2d272f9e8e16f09c741b (patch) | |
tree | ab9b7cd2d5986e9707dad18f8447be3cc469d468 /src/doc | |
parent | 34ed89b61c06c4674260aa6f5f3139aa6310aee5 (diff) | |
parent | b5eea82532059738a7da751222ebef68539508f1 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
* origin/5.10:
Merge remote-tracking branch 'origin/5.9' into 5.10
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:
src/bluetoothsettings/discoverymodel.cpp
src/localesettings/localefiltermodel.cpp
src/localesettings/localemodel.cpp
src/timedatesettings/timezonefiltermodel.cpp
Change-Id: Iabf7f372c634abea2734c97d748b3e836394ddb1
Diffstat (limited to 'src/doc')
-rw-r--r-- | src/doc/src/external-resources.qdoc | 21 | ||||
-rw-r--r-- | src/doc/src/qtdeviceutilities.qdoc | 21 | ||||
-rw-r--r-- | src/doc/src/wifiexample.qdoc | 21 |
3 files changed, 45 insertions, 18 deletions
diff --git a/src/doc/src/external-resources.qdoc b/src/doc/src/external-resources.qdoc index 2edf436..38e9654 100644 --- a/src/doc/src/external-resources.qdoc +++ b/src/doc/src/external-resources.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$ ** ****************************************************************************/ /*! 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$ ** ****************************************************************************/ /*! diff --git a/src/doc/src/wifiexample.qdoc b/src/doc/src/wifiexample.qdoc index 6e28099..ce5d43c 100644 --- a/src/doc/src/wifiexample.qdoc +++ b/src/doc/src/wifiexample.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$ ** ****************************************************************************/ /*! |