diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-04-21 20:47:07 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-10 11:10:01 +0000 |
| commit | e005c91966c4f2ed29baa84f2961261bda6400b9 (patch) | |
| tree | 004a629ec2de427ce7673a0b5cced25bf84a313b | |
| parent | c77494fcf6f637069157d5607195755d687ea86a (diff) | |
make plugin .json naming better follow the project structure
it's more intuitive that way, and easier to deal with for the example
source install magic.
Change-Id: I547717463756c4b0bb86e401abfb5ddf7a605020
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| -rw-r--r-- | examples/sensors/grue/import/import.json (renamed from examples/sensors/grue/import/plugin.json) | 0 | ||||
| -rw-r--r-- | examples/sensors/grue/import/import.pro | 2 | ||||
| -rw-r--r-- | examples/sensors/grue/import/main.cpp | 2 | ||||
| -rw-r--r-- | examples/sensors/sensor_explorer/import/import.json (renamed from examples/sensors/sensor_explorer/import/plugin.json) | 0 | ||||
| -rw-r--r-- | examples/sensors/sensor_explorer/import/import.pro | 2 | ||||
| -rw-r--r-- | examples/sensors/sensor_explorer/import/main.cpp | 2 |
6 files changed, 4 insertions, 4 deletions
diff --git a/examples/sensors/grue/import/plugin.json b/examples/sensors/grue/import/import.json index 0967ef42..0967ef42 100644 --- a/examples/sensors/grue/import/plugin.json +++ b/examples/sensors/grue/import/import.json diff --git a/examples/sensors/grue/import/import.pro b/examples/sensors/grue/import/import.pro index e9b578fe..715df866 100644 --- a/examples/sensors/grue/import/import.pro +++ b/examples/sensors/grue/import/import.pro @@ -25,7 +25,7 @@ qmldir.path=$$DESTPATH INSTALLS += qmldir OTHER_FILES += \ - plugin.json qmldir + import.json qmldir # Copy the qmldir file to the same folder as the plugin binary cpqmldir.files = $$PWD/qmldir diff --git a/examples/sensors/grue/import/main.cpp b/examples/sensors/grue/import/main.cpp index 01d95c53..dc2372e2 100644 --- a/examples/sensors/grue/import/main.cpp +++ b/examples/sensors/grue/import/main.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class GrueSensorQmlImport : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json") + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "import.json") public: virtual void registerTypes(const char *uri) { diff --git a/examples/sensors/sensor_explorer/import/plugin.json b/examples/sensors/sensor_explorer/import/import.json index 0967ef42..0967ef42 100644 --- a/examples/sensors/sensor_explorer/import/plugin.json +++ b/examples/sensors/sensor_explorer/import/import.json diff --git a/examples/sensors/sensor_explorer/import/import.pro b/examples/sensors/sensor_explorer/import/import.pro index d666353c..210bfa29 100644 --- a/examples/sensors/sensor_explorer/import/import.pro +++ b/examples/sensors/sensor_explorer/import/import.pro @@ -25,7 +25,7 @@ qmldir.path=$$DESTPATH INSTALLS += target qmldir OTHER_FILES += \ - plugin.json qmldir + import.json qmldir # Copy the qmldir file to the same folder as the plugin binary cpqmldir.files = $$PWD/qmldir diff --git a/examples/sensors/sensor_explorer/import/main.cpp b/examples/sensors/sensor_explorer/import/main.cpp index bf80d9ff..03f83a33 100644 --- a/examples/sensors/sensor_explorer/import/main.cpp +++ b/examples/sensors/sensor_explorer/import/main.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class SensorExplorerDeclarativeModule : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json") + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "import.json") public: virtual void registerTypes(const char *uri) { |