diff options
34 files changed, 38 insertions, 38 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..55b8a0f 100644 --- a/src/imports/bluetoothsettings/plugin.cpp +++ b/src/imports/bluetoothsettings/plugin.cpp @@ -58,7 +58,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/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..cbf08cb 100644 --- a/src/imports/localdevice/plugin.cpp +++ b/src/imports/localdevice/plugin.cpp @@ -20,7 +20,7 @@ #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 +38,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 +53,7 @@ /*! \qmltype LocalDevice - \inqmlmodule com.theqtcompany.localdevice + \inqmlmodule QtDeviceUtilities.LocalDeviceSettings \ingroup utils-qmltypes \brief Singleton QML type providing access to utility functions. @@ -64,7 +64,7 @@ simply import the \c {LocalDevice} module: \qml - com.theqtcompany.localdevice + QtDeviceUtilities.LocalDeviceSettings \endqml @@ -109,7 +109,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/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..9a3b5ce 100644 --- a/src/imports/networksettings/plugin.cpp +++ b/src/imports/networksettings/plugin.cpp @@ -52,7 +52,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."); 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/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 diff --git a/src/settingsui/bluetooth/Bluetooth.qml b/src/settingsui/bluetooth/Bluetooth.qml index ee14247..d2a00bf 100644 --- a/src/settingsui/bluetooth/Bluetooth.qml +++ b/src/settingsui/bluetooth/Bluetooth.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.3 import QtQuick.Controls 2.0 -import com.theqtcompany.settings.bluetooth 1.0 +import QtDeviceUtilities.BluetoothSettings 1.0 Item { id: root diff --git a/src/settingsui/bluetooth/Discovery.qml b/src/settingsui/bluetooth/Discovery.qml index 5a51214..142dd09 100644 --- a/src/settingsui/bluetooth/Discovery.qml +++ b/src/settingsui/bluetooth/Discovery.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.3 import QtQuick.Controls 2.0 -import com.theqtcompany.settings.bluetooth 1.0 +import QtDeviceUtilities.BluetoothSettings 1.0 Item { id: top diff --git a/src/settingsui/display/Display.qml b/src/settingsui/display/Display.qml index a871666..036b765 100644 --- a/src/settingsui/display/Display.qml +++ b/src/settingsui/display/Display.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.3 import QtQuick.Controls 2.0 -import com.theqtcompany.settings.display 1.0 +import QtDeviceUtilities.DisplaySettings 1.0 Item { id: root diff --git a/src/settingsui/locale/Language.qml b/src/settingsui/locale/Language.qml index feee1b8..09aee63 100644 --- a/src/settingsui/locale/Language.qml +++ b/src/settingsui/locale/Language.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.3 import QtQuick.Controls 2.0 -import com.theqtcompany.settings.locale 1.0 +import QtDeviceUtilities.LocaleSettings 1.0 import QtQml 2.2 Item { diff --git a/src/settingsui/locale/RegionSelect.qml b/src/settingsui/locale/RegionSelect.qml index 9f998c6..a30dd5d 100644 --- a/src/settingsui/locale/RegionSelect.qml +++ b/src/settingsui/locale/RegionSelect.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.3 import QtQuick.Controls 2.0 -import com.theqtcompany.settings.locale 1.0 +import QtDeviceUtilities.LocaleSettings 1.0 import "../common" Item { diff --git a/src/settingsui/main.qml b/src/settingsui/main.qml index a194c4f..9037492 100644 --- a/src/settingsui/main.qml +++ b/src/settingsui/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Window 2.2 -import com.theqtcompany.settingsui 1.0 +import QtDeviceUtilities.SettingsUI 1.0 import QtQuick.Enterprise.VirtualKeyboard 2.0 import "common" diff --git a/src/settingsui/network/EditWiredSettings.qml b/src/settingsui/network/EditWiredSettings.qml index b2420ff..8ed707d 100644 --- a/src/settingsui/network/EditWiredSettings.qml +++ b/src/settingsui/network/EditWiredSettings.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.3 import QtQuick.Controls 2.0 -import com.theqtcompany.settings.network 1.0 +import QtDeviceUtilities.NetworkSettings 1.0 Item { id: root diff --git a/src/settingsui/network/NetworkSettings.qml b/src/settingsui/network/NetworkSettings.qml index 87df833..2f58adb 100644 --- a/src/settingsui/network/NetworkSettings.qml +++ b/src/settingsui/network/NetworkSettings.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.3 import QtQuick.Controls 2.0 -import com.theqtcompany.settings.network 1.0 +import QtDeviceUtilities.NetworkSettings 1.0 Item { property string title: qsTr("Network Settings") diff --git a/src/settingsui/network/WifiSelectorDelegate.qml b/src/settingsui/network/WifiSelectorDelegate.qml index 1f08d4b..ccbca42 100644 --- a/src/settingsui/network/WifiSelectorDelegate.qml +++ b/src/settingsui/network/WifiSelectorDelegate.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.3 import QtQuick.Controls 2.0 -import com.theqtcompany.settings.network 1.0 +import QtDeviceUtilities.NetworkSettings 1.0 ItemDelegate { id: root diff --git a/src/settingsui/network/WifiSettings.qml b/src/settingsui/network/WifiSettings.qml index a78a5e5..f09a77a 100644 --- a/src/settingsui/network/WifiSettings.qml +++ b/src/settingsui/network/WifiSettings.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.3 import QtQuick.Controls 2.0 -import com.theqtcompany.settings.network 1.0 +import QtDeviceUtilities.NetworkSettings 1.0 Item { id: root diff --git a/src/settingsui/network/WiredSettings.qml b/src/settingsui/network/WiredSettings.qml index 294e1a2..82247d9 100644 --- a/src/settingsui/network/WiredSettings.qml +++ b/src/settingsui/network/WiredSettings.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.3 import QtQuick.Controls 2.0 -import com.theqtcompany.settings.network 1.0 +import QtDeviceUtilities.NetworkSettings 1.0 Item { id: root diff --git a/src/settingsui/settingsuiplugin/pluginMain.qml b/src/settingsui/settingsuiplugin/pluginMain.qml index c465e52..ac313aa 100644 --- a/src/settingsui/settingsuiplugin/pluginMain.qml +++ b/src/settingsui/settingsuiplugin/pluginMain.qml @@ -39,7 +39,7 @@ import QtQuick.Controls 2.0 import Qt.labs.settings 1.0 import QtQuick.XmlListModel 2.0 import QtQuick.Enterprise.VirtualKeyboard 2.0 -import com.theqtcompany.localdevice 1.0 +import QtDeviceUtilities.LocalDeviceSettings 1.0 Rectangle { id: root diff --git a/src/settingsui/settingsuiplugin/qmldir b/src/settingsui/settingsuiplugin/qmldir index 0a883ed..542b7fe 100644 --- a/src/settingsui/settingsuiplugin/qmldir +++ b/src/settingsui/settingsuiplugin/qmldir @@ -1,2 +1,2 @@ -module com.theqtcompany.settingsui +module QtDeviceUtilities.SettingsUI plugin settingsuiplugin diff --git a/src/settingsui/settingsuiplugin/settingsuiplugin.pro b/src/settingsui/settingsuiplugin/settingsuiplugin.pro index 40f4ce3..5b11241 100644 --- a/src/settingsui/settingsuiplugin/settingsuiplugin.pro +++ b/src/settingsui/settingsuiplugin/settingsuiplugin.pro @@ -4,7 +4,7 @@ QT += qml quick CONFIG += qt plugin c++11 TARGET = $$qtLibraryTarget($$TARGET) -uri = com.theqtcompany.settingsui +uri = QtDeviceUtilities.SettingsUI # Input SOURCES += \ diff --git a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp index 8a8c1ee..94bfd72 100644 --- a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp +++ b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp @@ -4,7 +4,7 @@ void SettingsuipluginPlugin::registerTypes(const char *uri) { - // @uri com.theqtcompany.settingsui + // @uri QtDeviceUtilities.SettingsUI qmlRegisterType(QUrl("qrc:/pluginMain.qml"), uri, 1, 0, "SettingsUI"); } diff --git a/src/settingsui/timedate/AnalogClock.qml b/src/settingsui/timedate/AnalogClock.qml index b57ac7f..a883ea1 100644 --- a/src/settingsui/timedate/AnalogClock.qml +++ b/src/settingsui/timedate/AnalogClock.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Controls 2.0 -import com.theqtcompany.settings.timedate 1.0 +import QtDeviceUtilities.TimeDateSettings 1.0 Item { property var currentTime: TimeManager.time diff --git a/src/settingsui/timedate/CustomCalendar.qml b/src/settingsui/timedate/CustomCalendar.qml index b720a44..3f60431 100644 --- a/src/settingsui/timedate/CustomCalendar.qml +++ b/src/settingsui/timedate/CustomCalendar.qml @@ -38,7 +38,7 @@ import QtQuick.Layouts 1.3 import QtQuick.Controls 2.0 import Qt.labs.calendar 1.0 import QtQml 2.2 -import com.theqtcompany.settings.timedate 1.0 +import QtDeviceUtilities.TimeDateSettings 1.0 Rectangle { id: root diff --git a/src/settingsui/timedate/TimeDate.qml b/src/settingsui/timedate/TimeDate.qml index 2426f4a..05da6e5 100644 --- a/src/settingsui/timedate/TimeDate.qml +++ b/src/settingsui/timedate/TimeDate.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.3 import QtQuick.Controls 2.0 -import com.theqtcompany.settings.timedate 1.0 +import QtDeviceUtilities.TimeDateSettings 1.0 Item { id: root diff --git a/src/settingsui/timedate/TimezonesView.qml b/src/settingsui/timedate/TimezonesView.qml index 5d81121..ac61d92 100644 --- a/src/settingsui/timedate/TimezonesView.qml +++ b/src/settingsui/timedate/TimezonesView.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.3 import QtQuick.Controls 2.0 -import com.theqtcompany.settings.timedate 1.0 +import QtDeviceUtilities.TimeDateSettings 1.0 import "../common" Item { id: root |