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/settingsui/settingsuiplugin/icons | |
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/settingsui/settingsuiplugin/icons')
5 files changed, 100 insertions, 50 deletions
diff --git a/src/settingsui/settingsuiplugin/icons/generate_icons.sh b/src/settingsui/settingsuiplugin/icons/generate_icons.sh index 55867b8..7218df0 100755 --- a/src/settingsui/settingsuiplugin/icons/generate_icons.sh +++ b/src/settingsui/settingsuiplugin/icons/generate_icons.sh @@ -1,19 +1,29 @@ ############################################################################ ## -## Copyright (C) 2015 Digia Plc -## All rights reserved. -## For any questions to Digia, please use the contact form at -## http://www.qt.io +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ ## -## This file is part of Qt Enterprise Embedded. +## This file is part of the Device Utilities module of the Qt Toolkit. ## -## Licensees holding valid Qt Enterprise licenses may use this file in -## accordance with the Qt Enterprise License Agreement provided with the +## $QT_BEGIN_LICENSE:GPL$ +## 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 Digia. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. ## -## If you have questions regarding the use of this file, please use -## the contact form at http://www.qt.io +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ ## ############################################################################# #!/bin/bash diff --git a/src/settingsui/settingsuiplugin/icons/scripts/cimage.sh b/src/settingsui/settingsuiplugin/icons/scripts/cimage.sh index ae73622..adbbb7f 100755 --- a/src/settingsui/settingsuiplugin/icons/scripts/cimage.sh +++ b/src/settingsui/settingsuiplugin/icons/scripts/cimage.sh @@ -1,19 +1,29 @@ ############################################################################ ## -## Copyright (C) 2015 Digia Plc -## All rights reserved. -## For any questions to Digia, please use the contact form at -## http://www.qt.io +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ ## -## This file is part of Qt Enterprise Embedded. +## This file is part of the Device Utilities module of the Qt Toolkit. ## -## Licensees holding valid Qt Enterprise licenses may use this file in -## accordance with the Qt Enterprise License Agreement provided with the +## $QT_BEGIN_LICENSE:GPL$ +## 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 Digia. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. ## -## If you have questions regarding the use of this file, please use -## the contact form at http://www.qt.io +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ ## ############################################################################# #!/bin/bash diff --git a/src/settingsui/settingsuiplugin/icons/scripts/cimages.sh b/src/settingsui/settingsuiplugin/icons/scripts/cimages.sh index 94ac1cd..db1ad04 100755 --- a/src/settingsui/settingsuiplugin/icons/scripts/cimages.sh +++ b/src/settingsui/settingsuiplugin/icons/scripts/cimages.sh @@ -1,19 +1,29 @@ ############################################################################ ## -## Copyright (C) 2015 Digia Plc -## All rights reserved. -## For any questions to Digia, please use the contact form at -## http://www.qt.io +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ ## -## This file is part of Qt Enterprise Embedded. +## This file is part of the Device Utilities module of the Qt Toolkit. ## -## Licensees holding valid Qt Enterprise licenses may use this file in -## accordance with the Qt Enterprise License Agreement provided with the +## $QT_BEGIN_LICENSE:GPL$ +## 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 Digia. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. ## -## If you have questions regarding the use of this file, please use -## the contact form at http://www.qt.io +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ ## ############################################################################# #!/bin/bash diff --git a/src/settingsui/settingsuiplugin/icons/scripts/rimage.sh b/src/settingsui/settingsuiplugin/icons/scripts/rimage.sh index d98088f..69b65a3 100755 --- a/src/settingsui/settingsuiplugin/icons/scripts/rimage.sh +++ b/src/settingsui/settingsuiplugin/icons/scripts/rimage.sh @@ -1,19 +1,29 @@ ############################################################################ ## -## Copyright (C) 2015 Digia Plc -## All rights reserved. -## For any questions to Digia, please use the contact form at -## http://www.qt.io +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ ## -## This file is part of Qt Enterprise Embedded. +## This file is part of the Device Utilities module of the Qt Toolkit. ## -## Licensees holding valid Qt Enterprise licenses may use this file in -## accordance with the Qt Enterprise License Agreement provided with the +## $QT_BEGIN_LICENSE:GPL$ +## 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 Digia. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. ## -## If you have questions regarding the use of this file, please use -## the contact form at http://www.qt.io +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ ## ############################################################################# #!/bin/bash diff --git a/src/settingsui/settingsuiplugin/icons/scripts/rimages.sh b/src/settingsui/settingsuiplugin/icons/scripts/rimages.sh index 7b76da8..e9e01b0 100755 --- a/src/settingsui/settingsuiplugin/icons/scripts/rimages.sh +++ b/src/settingsui/settingsuiplugin/icons/scripts/rimages.sh @@ -1,19 +1,29 @@ ############################################################################ ## -## Copyright (C) 2015 Digia Plc -## All rights reserved. -## For any questions to Digia, please use the contact form at -## http://www.qt.io +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ ## -## This file is part of Qt Enterprise Embedded. +## This file is part of the Device Utilities module of the Qt Toolkit. ## -## Licensees holding valid Qt Enterprise licenses may use this file in -## accordance with the Qt Enterprise License Agreement provided with the +## $QT_BEGIN_LICENSE:GPL$ +## 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 Digia. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. ## -## If you have questions regarding the use of this file, please use -## the contact form at http://www.qt.io +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ ## ############################################################################# #!/bin/bash |