diff options
author | Jerome Pasion <jerome.pasion@digia.com> | 2013-08-08 17:42:48 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-09 12:46:05 +0200 |
commit | fc665d512736e1249480a835e26410a92939e535 (patch) | |
tree | 89bfa6eaf3a86382add3c27c20a5ade414d1c950 | |
parent | 84a4d5d9fe57af1091c4c36eabf8a674d7140bac (diff) |
Doc: Moved QML "plugins" example to "qmlextensionplugins"
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 <martin.smith@digia.com>
Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
-rw-r--r-- | examples/qml/qml.pro | 2 | ||||
-rw-r--r-- | examples/qml/qmlextensionplugins/doc/images/qml-plugins-example.png (renamed from examples/qml/plugins/doc/images/qml-plugins-example.png) | bin | 15773 -> 15773 bytes | |||
-rw-r--r-- | examples/qml/qmlextensionplugins/doc/src/qmlpluginex.qdoc (renamed from examples/qml/plugins/doc/src/qmlpluginex.qdoc) | 2 | ||||
-rw-r--r-- | examples/qml/qmlextensionplugins/imports/TimeExample/Clock.qml (renamed from examples/qml/plugins/imports/TimeExample/Clock.qml) | 0 | ||||
-rw-r--r-- | examples/qml/qmlextensionplugins/imports/TimeExample/center.png (renamed from examples/qml/plugins/imports/TimeExample/center.png) | bin | 765 -> 765 bytes | |||
-rw-r--r-- | examples/qml/qmlextensionplugins/imports/TimeExample/clock.png (renamed from examples/qml/plugins/imports/TimeExample/clock.png) | bin | 20653 -> 20653 bytes | |||
-rw-r--r-- | examples/qml/qmlextensionplugins/imports/TimeExample/hour.png (renamed from examples/qml/plugins/imports/TimeExample/hour.png) | bin | 625 -> 625 bytes | |||
-rw-r--r-- | examples/qml/qmlextensionplugins/imports/TimeExample/minute.png (renamed from examples/qml/plugins/imports/TimeExample/minute.png) | bin | 625 -> 625 bytes | |||
-rw-r--r-- | examples/qml/qmlextensionplugins/imports/TimeExample/qmldir (renamed from examples/qml/plugins/imports/TimeExample/qmldir) | 0 | ||||
-rw-r--r-- | examples/qml/qmlextensionplugins/plugin.cpp (renamed from examples/qml/plugins/plugin.cpp) | 0 | ||||
-rw-r--r-- | examples/qml/qmlextensionplugins/plugins.qml (renamed from examples/qml/plugins/plugins.qml) | 0 | ||||
-rw-r--r-- | examples/qml/qmlextensionplugins/plugins.qmlproject (renamed from examples/qml/plugins/plugins.qmlproject) | 0 | ||||
-rw-r--r-- | examples/qml/qmlextensionplugins/qmlextensionplugins.pro (renamed from examples/qml/plugins/plugins.pro) | 7 |
13 files changed, 5 insertions, 6 deletions
diff --git a/examples/qml/qml.pro b/examples/qml/qml.pro index 34b2622b98..8d9cca047f 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 Binary files differindex c2d4886ea2..c2d4886ea2 100644 --- a/examples/qml/plugins/doc/images/qml-plugins-example.png +++ b/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 index 5ea7237c8f..79a48358c8 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 index fa9cdadd1d..fa9cdadd1d 100644 --- a/examples/qml/plugins/imports/TimeExample/Clock.qml +++ b/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 Binary files differindex 7fbd802a44..7fbd802a44 100644 --- a/examples/qml/plugins/imports/TimeExample/center.png +++ b/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 Binary files differindex 462edacc0e..462edacc0e 100644 --- a/examples/qml/plugins/imports/TimeExample/clock.png +++ b/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 Binary files differindex f8061a1235..f8061a1235 100644 --- a/examples/qml/plugins/imports/TimeExample/hour.png +++ b/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 Binary files differindex 1297ec7c2b..1297ec7c2b 100644 --- a/examples/qml/plugins/imports/TimeExample/minute.png +++ b/examples/qml/qmlextensionplugins/imports/TimeExample/minute.png diff --git a/examples/qml/plugins/imports/TimeExample/qmldir b/examples/qml/qmlextensionplugins/imports/TimeExample/qmldir index 252e662e12..252e662e12 100644 --- a/examples/qml/plugins/imports/TimeExample/qmldir +++ b/examples/qml/qmlextensionplugins/imports/TimeExample/qmldir diff --git a/examples/qml/plugins/plugin.cpp b/examples/qml/qmlextensionplugins/plugin.cpp index a125138dd0..a125138dd0 100644 --- a/examples/qml/plugins/plugin.cpp +++ b/examples/qml/qmlextensionplugins/plugin.cpp diff --git a/examples/qml/plugins/plugins.qml b/examples/qml/qmlextensionplugins/plugins.qml index a82c12b7fd..a82c12b7fd 100644 --- a/examples/qml/plugins/plugins.qml +++ b/examples/qml/qmlextensionplugins/plugins.qml diff --git a/examples/qml/plugins/plugins.qmlproject b/examples/qml/qmlextensionplugins/plugins.qmlproject index 771ab45b66..771ab45b66 100644 --- a/examples/qml/plugins/plugins.qmlproject +++ b/examples/qml/qmlextensionplugins/plugins.qmlproject diff --git a/examples/qml/plugins/plugins.pro b/examples/qml/qmlextensionplugins/qmlextensionplugins.pro index d86df72962..64fd23af8d 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 - |