diff options
author | Gatis Paeglis <gatis.paeglis@qt.io> | 2016-10-26 15:27:17 +0200 |
---|---|---|
committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2016-11-02 12:25:50 +0000 |
commit | ccbb82ad8495284f49338c1122eb061afbf03bc2 (patch) | |
tree | 11c6c5b51c4e22436160725d1a3d80d7fefe8f0e | |
parent | 2f96b99e969ea7d4a183d413712f16cc0fe0f979 (diff) |
Rename QtOTAUpdate -> QtOtaUpdate
To be consistent with other Qt libs/modules.
Change-Id: Ia9334c96c4b0bafca9a5c3b0615cf8c325e55243
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
-rw-r--r-- | doc/config/navigation.qdocconf | 2 | ||||
-rw-r--r-- | doc/config/qtota-project.qdocconf | 4 | ||||
-rw-r--r-- | doc/ota-module.qdoc | 2 | ||||
-rw-r--r-- | examples/qml/basic/main.qml | 2 | ||||
-rw-r--r-- | src/imports/imports.pro | 2 | ||||
-rw-r--r-- | src/imports/pluginmain.cpp | 10 | ||||
-rw-r--r-- | src/imports/qmldir | 2 | ||||
-rw-r--r-- | src/lib/lib.pro | 2 | ||||
-rw-r--r-- | sync.profile | 2 |
9 files changed, 14 insertions, 14 deletions
diff --git a/doc/config/navigation.qdocconf b/doc/config/navigation.qdocconf index 0a45837..7609d89 100644 --- a/doc/config/navigation.qdocconf +++ b/doc/config/navigation.qdocconf @@ -1,4 +1,4 @@ -url = https://doc.qt.io/QtOTA +url = https://doc.qt.io/qtota navigation.homepage = "Qt Documentation (Technology Preview)" navigation.landingpage = "Over the Air Update" navigation.cppclassespage = "Qt OTA Update C++ Classes" diff --git a/doc/config/qtota-project.qdocconf b/doc/config/qtota-project.qdocconf index 46a3bbf..dd3b18b 100644 --- a/doc/config/qtota-project.qdocconf +++ b/doc/config/qtota-project.qdocconf @@ -1,6 +1,6 @@ include($QT_INSTALL_DOCS/global/qt-cpp-defines.qdocconf) -project = QtOTA +project = QtOta description = Qt OTA Update Documentation version = $QT_VERSION @@ -9,7 +9,7 @@ headerdirs += ../../src/lib/ indexes = $QT_INSTALL_DOCS/qtcore/qtcore.index -qhp.projects = QtOTA +qhp.projects = QtOta qhp.QtAutomotiveOTA.file = qtota.qhp qhp.QtAutomotiveOTA.namespace = io.qt.qtota.$QT_VERSION_TAG diff --git a/doc/ota-module.qdoc b/doc/ota-module.qdoc index 710262a..bc65b4d 100644 --- a/doc/ota-module.qdoc +++ b/doc/ota-module.qdoc @@ -32,7 +32,7 @@ */ /*! - \qmlmodule QtOTAUpdate 1.0 + \qmlmodule QtOtaUpdate 1.0 \title Qt OTA Update QML Types */ diff --git a/examples/qml/basic/main.qml b/examples/qml/basic/main.qml index 80038e1..9c8ccf1 100644 --- a/examples/qml/basic/main.qml +++ b/examples/qml/basic/main.qml @@ -30,7 +30,7 @@ import QtQuick 2.7 import QtQuick.Window 2.2 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 -import QtOTAUpdate 1.0 +import QtOtaUpdate 1.0 Window { visible:true diff --git a/src/imports/imports.pro b/src/imports/imports.pro index a078e84..16c94f6 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,6 +1,6 @@ CXX_MODULE = qml TARGET = qtotaupdateplugin -TARGETPATH = QtOTAUpdate/ +TARGETPATH = QtOtaUpdate/ IMPORT_VERSION = 1.0 QT += qml qtotaupdate diff --git a/src/imports/pluginmain.cpp b/src/imports/pluginmain.cpp index 69f6ef5..963a232 100644 --- a/src/imports/pluginmain.cpp +++ b/src/imports/pluginmain.cpp @@ -26,14 +26,14 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtOTAUpdate/QOTAClient> -#include <QtOTAUpdate/QOtaRepositoryConfig> +#include <QtOtaUpdate/QOTAClient> +#include <QtOtaUpdate/QOtaRepositoryConfig> #include <QtQml> QT_BEGIN_NAMESPACE /*! - \inqmlmodule QtOTAUpdate + \inqmlmodule QtOtaUpdate \qmltype OTAClient \instantiates QOTAClient \brief Main interface to the OTA functionality. @@ -349,7 +349,7 @@ QT_BEGIN_NAMESPACE */ /*! - \inqmlmodule QtOTAUpdate + \inqmlmodule QtOtaUpdate \qmltype OtaRepositoryConfig \instantiates QOtaRepositoryConfig \brief Used to configure the OSTree repository. @@ -454,7 +454,7 @@ class QOTAUpdatePlugin : public QQmlExtensionPlugin public: virtual void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == QLatin1String("QtOTAUpdate")); + Q_ASSERT(QLatin1String(uri) == QLatin1String("QtOtaUpdate")); qmlRegisterSingletonType<QOTAClient>(uri, 1, 0, "OTAClient", otaClientSingleton); qmlRegisterType<QOtaRepositoryConfig>(uri, 1, 0, "OtaRepositoryConfig"); diff --git a/src/imports/qmldir b/src/imports/qmldir index c33762e..a39b460 100644 --- a/src/imports/qmldir +++ b/src/imports/qmldir @@ -1,2 +1,2 @@ -module QtOTAUpdate +module QtOtaUpdate plugin qtotaupdateplugin diff --git a/src/lib/lib.pro b/src/lib/lib.pro index c4f67c4..4526ff5 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -1,4 +1,4 @@ -TARGET = QtOTAUpdate +TARGET = QtOtaUpdate QT = core MODULE = qtotaupdate diff --git a/sync.profile b/sync.profile index a33bf44..3d8a21d 100644 --- a/sync.profile +++ b/sync.profile @@ -1,5 +1,5 @@ %modules = ( # path to module name map - "QtOTAUpdate" => "$basedir/src/lib" + "QtOtaUpdate" => "$basedir/src/lib" ); %moduleheaders = ( # restrict the module headers to those found in relative path ); |