projects / platform / upstream / qtdeclarative.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 84a4d5d) | patch
Doc: Moved QML "plugins" example to "qmlextensionplugins"
authorJerome Pasion <jerome.pasion@digia.com>
Thu, 8 Aug 2013 15:42:48 +0000 (17:42 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 9 Aug 2013 10:46:05 +0000 (12:46 +0200)
commitfc665d512736e1249480a835e26410a92939e535
tree89bfa6eaf3a86382add3c27c20a5ade414d1c950tree | snapshot
parent84a4d5d9fe57af1091c4c36eabf8a674d7140baccommit | 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>
13 files changed:
examples/qml/qml.pro diff | blob | history
examples/qml/qmlextensionplugins/doc/images/qml-plugins-example.png [moved from examples/qml/plugins/doc/images/qml-plugins-example.png with 100% similarity] blob | history
examples/qml/qmlextensionplugins/doc/src/qmlpluginex.qdoc [moved from examples/qml/plugins/doc/src/qmlpluginex.qdoc with 97% similarity] diff | blob | history
examples/qml/qmlextensionplugins/imports/TimeExample/Clock.qml [moved from examples/qml/plugins/imports/TimeExample/Clock.qml with 100% similarity] blob | history
examples/qml/qmlextensionplugins/imports/TimeExample/center.png [moved from examples/qml/plugins/imports/TimeExample/center.png with 100% similarity] blob | history
examples/qml/qmlextensionplugins/imports/TimeExample/clock.png [moved from examples/qml/plugins/imports/TimeExample/clock.png with 100% similarity] blob | history
examples/qml/qmlextensionplugins/imports/TimeExample/hour.png [moved from examples/qml/plugins/imports/TimeExample/hour.png with 100% similarity] blob | history
examples/qml/qmlextensionplugins/imports/TimeExample/minute.png [moved from examples/qml/plugins/imports/TimeExample/minute.png with 100% similarity] blob | history
examples/qml/qmlextensionplugins/imports/TimeExample/qmldir [moved from examples/qml/plugins/imports/TimeExample/qmldir with 100% similarity] blob | history
examples/qml/qmlextensionplugins/plugin.cpp [moved from examples/qml/plugins/plugin.cpp with 100% similarity] blob | history
examples/qml/qmlextensionplugins/plugins.qml [moved from examples/qml/plugins/plugins.qml with 100% similarity] blob | history
examples/qml/qmlextensionplugins/plugins.qmlproject [moved from examples/qml/plugins/plugins.qmlproject with 100% similarity] blob | history
examples/qml/qmlextensionplugins/qmlextensionplugins.pro [moved from examples/qml/plugins/plugins.pro with 64% similarity] diff | blob | history
Domain: UI Framework / Qt;