From fc665d512736e1249480a835e26410a92939e535 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Thu, 8 Aug 2013 17:42:48 +0200 Subject: [PATCH] Doc: Moved QML "plugins" example to "qmlextensionplugins" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The example generates a plugins.html which collides with the plugins.html from qtbase repository. Task-number: QTBUG-32580 Change-Id: I47ce9e00378738f7696672e6e47dd3337bb4fafc Reviewed-by: Martin Smith Reviewed-by: Topi Reiniö --- examples/qml/qml.pro | 2 +- .../doc/images/qml-plugins-example.png | Bin .../doc/src/qmlpluginex.qdoc | 2 +- .../imports/TimeExample/Clock.qml | 0 .../imports/TimeExample/center.png | Bin .../imports/TimeExample/clock.png | Bin .../imports/TimeExample/hour.png | Bin .../imports/TimeExample/minute.png | Bin .../imports/TimeExample/qmldir | 0 examples/qml/{plugins => qmlextensionplugins}/plugin.cpp | 0 examples/qml/{plugins => qmlextensionplugins}/plugins.qml | 0 .../qml/{plugins => qmlextensionplugins}/plugins.qmlproject | 0 .../qmlextensionplugins.pro} | 7 +++---- 13 files changed, 5 insertions(+), 6 deletions(-) rename examples/qml/{plugins => qmlextensionplugins}/doc/images/qml-plugins-example.png (100%) rename examples/qml/{plugins => qmlextensionplugins}/doc/src/qmlpluginex.qdoc (97%) rename examples/qml/{plugins => qmlextensionplugins}/imports/TimeExample/Clock.qml (100%) rename examples/qml/{plugins => qmlextensionplugins}/imports/TimeExample/center.png (100%) rename examples/qml/{plugins => qmlextensionplugins}/imports/TimeExample/clock.png (100%) rename examples/qml/{plugins => qmlextensionplugins}/imports/TimeExample/hour.png (100%) rename examples/qml/{plugins => qmlextensionplugins}/imports/TimeExample/minute.png (100%) rename examples/qml/{plugins => qmlextensionplugins}/imports/TimeExample/qmldir (100%) rename examples/qml/{plugins => qmlextensionplugins}/plugin.cpp (100%) rename examples/qml/{plugins => qmlextensionplugins}/plugins.qml (100%) rename examples/qml/{plugins => qmlextensionplugins}/plugins.qmlproject (100%) rename examples/qml/{plugins/plugins.pro => qmlextensionplugins/qmlextensionplugins.pro} (64%) diff --git a/examples/qml/qml.pro b/examples/qml/qml.pro index 34b2622..8d9cca0 100644 --- a/examples/qml/qml.pro +++ b/examples/qml/qml.pro @@ -3,7 +3,7 @@ TEMPLATE = subdirs qtHaveModule(quick): SUBDIRS += networkaccessmanagerfactory xmlhttprequest SUBDIRS += \ - plugins \ + qmlextensionplugins \ referenceexamples \ shell diff --git a/examples/qml/plugins/doc/images/qml-plugins-example.png b/examples/qml/qmlextensionplugins/doc/images/qml-plugins-example.png similarity index 100% rename from examples/qml/plugins/doc/images/qml-plugins-example.png rename to examples/qml/qmlextensionplugins/doc/images/qml-plugins-example.png diff --git a/examples/qml/plugins/doc/src/qmlpluginex.qdoc b/examples/qml/qmlextensionplugins/doc/src/qmlpluginex.qdoc similarity index 97% rename from examples/qml/plugins/doc/src/qmlpluginex.qdoc rename to examples/qml/qmlextensionplugins/doc/src/qmlpluginex.qdoc index 5ea7237..79a4835 100644 --- a/examples/qml/plugins/doc/src/qmlpluginex.qdoc +++ b/examples/qml/qmlextensionplugins/doc/src/qmlpluginex.qdoc @@ -27,7 +27,7 @@ /*! \title QML Plugin Example - \example plugins + \example qmlextensionplugins \brief This example creates a C++ plugin extension by subclassing QQmlExtensionPlugin. diff --git a/examples/qml/plugins/imports/TimeExample/Clock.qml b/examples/qml/qmlextensionplugins/imports/TimeExample/Clock.qml similarity index 100% rename from examples/qml/plugins/imports/TimeExample/Clock.qml rename to examples/qml/qmlextensionplugins/imports/TimeExample/Clock.qml diff --git a/examples/qml/plugins/imports/TimeExample/center.png b/examples/qml/qmlextensionplugins/imports/TimeExample/center.png similarity index 100% rename from examples/qml/plugins/imports/TimeExample/center.png rename to examples/qml/qmlextensionplugins/imports/TimeExample/center.png diff --git a/examples/qml/plugins/imports/TimeExample/clock.png b/examples/qml/qmlextensionplugins/imports/TimeExample/clock.png similarity index 100% rename from examples/qml/plugins/imports/TimeExample/clock.png rename to examples/qml/qmlextensionplugins/imports/TimeExample/clock.png diff --git a/examples/qml/plugins/imports/TimeExample/hour.png b/examples/qml/qmlextensionplugins/imports/TimeExample/hour.png similarity index 100% rename from examples/qml/plugins/imports/TimeExample/hour.png rename to examples/qml/qmlextensionplugins/imports/TimeExample/hour.png diff --git a/examples/qml/plugins/imports/TimeExample/minute.png b/examples/qml/qmlextensionplugins/imports/TimeExample/minute.png similarity index 100% rename from examples/qml/plugins/imports/TimeExample/minute.png rename to examples/qml/qmlextensionplugins/imports/TimeExample/minute.png diff --git a/examples/qml/plugins/imports/TimeExample/qmldir b/examples/qml/qmlextensionplugins/imports/TimeExample/qmldir similarity index 100% rename from examples/qml/plugins/imports/TimeExample/qmldir rename to examples/qml/qmlextensionplugins/imports/TimeExample/qmldir diff --git a/examples/qml/plugins/plugin.cpp b/examples/qml/qmlextensionplugins/plugin.cpp similarity index 100% rename from examples/qml/plugins/plugin.cpp rename to examples/qml/qmlextensionplugins/plugin.cpp diff --git a/examples/qml/plugins/plugins.qml b/examples/qml/qmlextensionplugins/plugins.qml similarity index 100% rename from examples/qml/plugins/plugins.qml rename to examples/qml/qmlextensionplugins/plugins.qml diff --git a/examples/qml/plugins/plugins.qmlproject b/examples/qml/qmlextensionplugins/plugins.qmlproject similarity index 100% rename from examples/qml/plugins/plugins.qmlproject rename to examples/qml/qmlextensionplugins/plugins.qmlproject diff --git a/examples/qml/plugins/plugins.pro b/examples/qml/qmlextensionplugins/qmlextensionplugins.pro similarity index 64% rename from examples/qml/plugins/plugins.pro rename to examples/qml/qmlextensionplugins/qmlextensionplugins.pro index d86df72..64fd23a 100644 --- a/examples/qml/plugins/plugins.pro +++ b/examples/qml/qmlextensionplugins/qmlextensionplugins.pro @@ -16,9 +16,8 @@ pluginfiles.files += \ imports/TimeExample/minute.png qml.files = plugins.qml -qml.path += $$[QT_INSTALL_EXAMPLES]/qml/plugins -target.path += $$[QT_INSTALL_EXAMPLES]/qml/plugins/imports/TimeExample -pluginfiles.path += $$[QT_INSTALL_EXAMPLES]/qml/plugins/imports/TimeExample +qml.path += $$[QT_INSTALL_EXAMPLES]/qml/qmlextensionplugins +target.path += $$[QT_INSTALL_EXAMPLES]/qml/qmlextensionplugins/imports/TimeExample +pluginfiles.path += $$[QT_INSTALL_EXAMPLES]/qml/qmlextensionplugins/imports/TimeExample INSTALLS += target qml pluginfiles - -- 2.7.4