Merge remote-tracking branch 'origin/5.7' into dev

* origin/5.7:
  Changed SettingsUI application install path to QT_INSTALL_BINS
  Fixed WPA supplicant and made it default backend for wifi settings.
  Replaced license headers with GPLv3
  Replaced VirtualKeyboard import uri
  Replaced Device Utilities import uris to QtDeviceUtilities.x
  Separated SettingsUI to its own plugin.

Change-Id: I403452bc5a9a6b4d21ef635d07a22571581603bf

19 files changed, 112 insertions, 147 deletions

diff --git a/src/imports/bluetoothsettings/bluetoothsettings.pro b/src/imports/bluetoothsettings/bluetoothsettings.pro
index 3475ffa..3e6e6b5 100644
--- a/src/imports/bluetoothsettings/bluetoothsettings.pro
+++ b/src/imports/bluetoothsettings/bluetoothsettings.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 CONFIG += plugin
 QT += qml bluetooth bluetoothsettings
-uri = com.theqtcompany.settings.bluetooth
+uri = QtDeviceUtilities.BluetoothSettings
 
 TARGET  = btsettingsplugin
 
diff --git a/src/imports/bluetoothsettings/plugin.cpp b/src/imports/bluetoothsettings/plugin.cpp
index 20f5b28..abd6ec3 100644
--- a/src/imports/bluetoothsettings/plugin.cpp
+++ b/src/imports/bluetoothsettings/plugin.cpp
@@ -1,39 +1,31 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Qt Device Utilities module of the Qt Toolkit.
+** This file is part of the Device Utilities module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $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 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.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
+** 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$
 **
 ****************************************************************************/
-
 #include <QtQml/QQmlExtensionPlugin>
 #include <QtQml/qqml.h>
 #include <qcoreapplication.h>
@@ -58,7 +50,7 @@ class BluetoothSettingsQmlPlugin : public QQmlExtensionPlugin
 public:
     void registerTypes(const char *uri)
     {
-        Q_ASSERT(QLatin1String(uri) == QLatin1String("com.theqtcompany.settings.bluetooth"));
+        Q_ASSERT(QLatin1String(uri) == QLatin1String("QtDeviceUtilities.BluetoothSettings"));
         qmlRegisterUncreatableType<BtDeviceItem>(uri, 1, 0, "BtDeviceItem", "Cannot be instantiated directly.");
         qmlRegisterSingletonType<BluetoothDevice>(uri, 1, 0, "BtDevice", &instance<BluetoothDevice>);
     }
diff --git a/src/imports/bluetoothsettings/qmldir b/src/imports/bluetoothsettings/qmldir
index f63b52f..eda1c88 100644
--- a/src/imports/bluetoothsettings/qmldir
+++ b/src/imports/bluetoothsettings/qmldir
@@ -1,2 +1,2 @@
-module com.theqtcompany.settings.bluetooth
+module QtDeviceUtilities.BluetoothSettings
 plugin btsettingsplugin
diff --git a/src/imports/displaysettings/displaysettings.pro b/src/imports/displaysettings/displaysettings.pro
index 4c581f4..c148227 100644
--- a/src/imports/displaysettings/displaysettings.pro
+++ b/src/imports/displaysettings/displaysettings.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
 CONFIG += plugin
 QT += qml displaysettings
 
-uri = com.theqtcompany.settings.display
+uri = QtDeviceUtilities.DisplaySettings
 
 TARGET  = qmldisplaysettingsplugin
 
diff --git a/src/imports/displaysettings/plugin.cpp b/src/imports/displaysettings/plugin.cpp
index 92c0171..a57b340 100644
--- a/src/imports/displaysettings/plugin.cpp
+++ b/src/imports/displaysettings/plugin.cpp
@@ -1,39 +1,31 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Qt Device Utilities module of the Qt Toolkit.
+** This file is part of the Device Utilities module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $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 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.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
+** 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$
 **
 ****************************************************************************/
-
 #include <QtQml/QQmlExtensionPlugin>
 #include <QtQml/qqml.h>
 #include <QQmlEngine>
diff --git a/src/imports/displaysettings/qmldir b/src/imports/displaysettings/qmldir
index 4f8a3db..35c1462 100644
--- a/src/imports/displaysettings/qmldir
+++ b/src/imports/displaysettings/qmldir
@@ -1,2 +1,2 @@
-module com.theqtcompany.settings.display
+module QtDeviceUtilities.DisplaySettings
 plugin qmldisplaysettingsplugin
diff --git a/src/imports/localdevice/localdevice.pro b/src/imports/localdevice/localdevice.pro
index dfcbcf9..0ef1980 100644
--- a/src/imports/localdevice/localdevice.pro
+++ b/src/imports/localdevice/localdevice.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 CONFIG += plugin
 TARGET  = localdeviceplugin
-uri = com.theqtcompany.localdevice
+uri = QtDeviceUtilities.LocalDeviceSettings
 
 QT += qml localdevice
 
diff --git a/src/imports/localdevice/plugin.cpp b/src/imports/localdevice/plugin.cpp
index b69d9b4..4ede971 100644
--- a/src/imports/localdevice/plugin.cpp
+++ b/src/imports/localdevice/plugin.cpp
@@ -1,26 +1,36 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use the contact form at
-** http://www.qt.io
+** Copyright (C) 2016 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$
 **
 ****************************************************************************/
 #include <qlocaldevice.h>
 #include <QtQml>
 
 /*!
-    \qmlmodule com.theqtcompany.localdevice 1.0
+    \qmlmodule QtDeviceUtilities.LocalDeviceSettings 1.0
     \title Qt Local Device QML Module
     \ingroup qtee-qmlmodules
     \brief A collection of the local device related utility functions, accessible from QML.
@@ -38,7 +48,7 @@
     Import the module as follows:
 
     \badcode
-    import com.theqtcompany.localdevice 1.0
+    import QtDeviceUtilities.LocalDeviceSettings 1.0
     \endcode
 
     This will give you access to the singleton QML type LocalDevice.
@@ -53,7 +63,7 @@
 
 /*!
     \qmltype LocalDevice
-    \inqmlmodule com.theqtcompany.localdevice
+    \inqmlmodule QtDeviceUtilities.LocalDeviceSettings
     \ingroup utils-qmltypes
     \brief Singleton QML type providing access to utility functions.
 
@@ -64,7 +74,7 @@
     simply import the \c {LocalDevice} module:
 
     \qml
-    com.theqtcompany.localdevice
+    QtDeviceUtilities.LocalDeviceSettings
 
     \endqml
 
@@ -109,7 +119,7 @@ public:
 
     void registerTypes(const char *uri)
     {
-        Q_ASSERT(QLatin1String(uri) == "com.theqtcompany.localdevice");
+        Q_ASSERT(QLatin1String(uri) == "QtDeviceUtilities.LocalDeviceSettings");
         qmlRegisterSingletonType<QLocalDevice>(uri, 1, 0, "LocalDevice", module_api_factory);
     }
 };
diff --git a/src/imports/localdevice/qmldir b/src/imports/localdevice/qmldir
index ae1b1c5..1d9791b 100644
--- a/src/imports/localdevice/qmldir
+++ b/src/imports/localdevice/qmldir
@@ -1,3 +1,3 @@
-module com.theqtcompany.localdevice
+module QtDeviceUtilities.LocalDeviceSettings
 plugin localdeviceplugin
 typeinfo plugins.qmltypes
diff --git a/src/imports/localesettings/localesettings.pro b/src/imports/localesettings/localesettings.pro
index 891e4f8..35656ea 100644
--- a/src/imports/localesettings/localesettings.pro
+++ b/src/imports/localesettings/localesettings.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
 CONFIG += plugin
 QT += qml localesettings
 
-uri = com.theqtcompany.settings.locale
+uri = QtDeviceUtilities.LocaleSettings
 
 TARGET  = localesettingsplugin
 
diff --git a/src/imports/localesettings/plugin.cpp b/src/imports/localesettings/plugin.cpp
index 1c2bcca..737ff0c 100644
--- a/src/imports/localesettings/plugin.cpp
+++ b/src/imports/localesettings/plugin.cpp
@@ -1,39 +1,31 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Qt Device Utilities module of the Qt Toolkit.
+** This file is part of the Device Utilities module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $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 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.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
+** 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$
 **
 ****************************************************************************/
-
 #include <QtQml/QQmlExtensionPlugin>
 #include <QtQml/qqml.h>
 #include <qcoreapplication.h>
diff --git a/src/imports/localesettings/qmldir b/src/imports/localesettings/qmldir
index 3c59bb0..e02d748 100644
--- a/src/imports/localesettings/qmldir
+++ b/src/imports/localesettings/qmldir
@@ -1,2 +1,2 @@
-module com.theqtcompany.settings.locale
+module QtDeviceUtilities.LocaleSettings
 plugin localesettingsplugin
diff --git a/src/imports/networksettings/networksettings.pro b/src/imports/networksettings/networksettings.pro
index 45228c5..1b16421 100644
--- a/src/imports/networksettings/networksettings.pro
+++ b/src/imports/networksettings/networksettings.pro
@@ -3,7 +3,7 @@ TARGET = networksettingsplugin
 QT += qml quick networksettings
 CONFIG += qt plugin
 
-uri = com.theqtcompany.settings.network
+uri = QtDeviceUtilities.NetworkSettings
 
 SOURCES += \
     plugin.cpp \
diff --git a/src/imports/networksettings/plugin.cpp b/src/imports/networksettings/plugin.cpp
index ab81e31..5427082 100644
--- a/src/imports/networksettings/plugin.cpp
+++ b/src/imports/networksettings/plugin.cpp
@@ -1,34 +1,27 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Qt Device Utilities module of the Qt Toolkit.
+** This file is part of the Device Utilities module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $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 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.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
+** 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$
 **
@@ -52,7 +45,7 @@ QObject *instance(QQmlEngine *engine, QJSEngine *) {
 
 void NetworksettingspluginPlugin::registerTypes(const char *uri)
 {
-    Q_ASSERT(QLatin1String(uri) == QLatin1String("com.theqtcompany.settings.network"));
+    Q_ASSERT(QLatin1String(uri) == QLatin1String("QtDeviceUtilities.NetworkSettings"));
     qmlRegisterUncreatableType<QNetworkSettingsService>(uri, 1, 0, "NetworkService", "Cannot be instantiated directly.");
     qmlRegisterUncreatableType<QNetworkSettingsIPv4>(uri, 1, 0, "NetworkSettingsIPv4", "Cannot be instantiated directly.");
     qmlRegisterUncreatableType<QNetworkSettingsIPv6>(uri, 1, 0, "NetworkSettingsIPv6", "Cannot be instantiated directly.");
@@ -60,6 +53,6 @@ void NetworksettingspluginPlugin::registerTypes(const char *uri)
     qmlRegisterUncreatableType<QNetworkSettingsType>(uri, 1, 0, "NetworkSettingsType", "Cannot be instantiated directly.");
     qmlRegisterUncreatableType<QNetworkSettingsState>(uri, 1, 0, "NetworkSettingsState", "Cannot be instantiated directly.");
 
+    qRegisterMetaType<QNetworkSettingsUserAgent*>("QNetworkSettingsUserAgent*");
     qmlRegisterSingletonType<QNetworkSettingsManager>(uri, 1, 0, "NetworkSettingsManager", &instance<QNetworkSettingsManager>);
-    qmlRegisterSingletonType<QNetworkSettingsUserAgent>(uri, 1, 0, "NetworkSettingsUserAgent", &instance<QNetworkSettingsUserAgent>);
 }
diff --git a/src/imports/networksettings/plugin.h b/src/imports/networksettings/plugin.h
index 40e02e2..61f148c 100644
--- a/src/imports/networksettings/plugin.h
+++ b/src/imports/networksettings/plugin.h
@@ -1,34 +1,27 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Qt Device Utilities module of the Qt Toolkit.
+** This file is part of the Device Utilities module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $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 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.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
+** 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$
 **
diff --git a/src/imports/networksettings/qmldir b/src/imports/networksettings/qmldir
index 7774745..c2c0dec 100644
--- a/src/imports/networksettings/qmldir
+++ b/src/imports/networksettings/qmldir
@@ -1,3 +1,3 @@
-module com.theqtcompany.settings.network
+module QtDeviceUtilities.NetworkSettings
 plugin networksettingsplugin
 
diff --git a/src/imports/timedatesettings/plugin.cpp b/src/imports/timedatesettings/plugin.cpp
index 0f67699..c725a10 100644
--- a/src/imports/timedatesettings/plugin.cpp
+++ b/src/imports/timedatesettings/plugin.cpp
@@ -1,34 +1,27 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Qt Device Utilities module of the Qt Toolkit.
+** This file is part of the Device Utilities module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $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 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.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
+** 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$
 **
diff --git a/src/imports/timedatesettings/qmldir b/src/imports/timedatesettings/qmldir
index 3fc8fec..cd39356 100644
--- a/src/imports/timedatesettings/qmldir
+++ b/src/imports/timedatesettings/qmldir
@@ -1,2 +1,2 @@
-module com.theqtcompany.settings.timedate
+module QtDeviceUtilities.TimeDateSettings
 plugin qmltimedatesettingsplugin
diff --git a/src/imports/timedatesettings/timedatesettings.pro b/src/imports/timedatesettings/timedatesettings.pro
index ec86d4e..5e5f913 100644
--- a/src/imports/timedatesettings/timedatesettings.pro
+++ b/src/imports/timedatesettings/timedatesettings.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
 CONFIG += plugin
 QT += qml timedatesettings
 
-uri = com.theqtcompany.settings.timedate
+uri = QtDeviceUtilities.TimeDateSettings
 
 DESTDIR = imports/TimeDate
 TARGET  = qmltimedatesettingsplugin