qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jerome Pasion 2013-08-08 17:42:48 +02:00 committed by The Qt Project
parent 84a4d5d9fe
commit fc665d5127
13 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/qml/qml.pro
View File

@ -3,7 +3,7 @@ TEMPLATE = subdirs
qtHaveModule(quick): SUBDIRS += networkaccessmanagerfactory xmlhttprequest qtHaveModule(quick): SUBDIRS += networkaccessmanagerfactory xmlhttprequest
SUBDIRS += \ SUBDIRS += \
plugins \ qmlextensionplugins \
referenceexamples \ referenceexamples \
shell shell

0
examples/qml/plugins/doc/images/qml-plugins-example.png → examples/qml/qmlextensionplugins/doc/images/qml-plugins-example.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

2
examples/qml/plugins/doc/src/qmlpluginex.qdoc → examples/qml/qmlextensionplugins/doc/src/qmlpluginex.qdoc
View File

@ -27,7 +27,7 @@
/*! /*!
\title QML Plugin Example \title QML Plugin Example
\example plugins \example qmlextensionplugins
\brief This example creates a C++ plugin extension by subclassing QQmlExtensionPlugin. \brief This example creates a C++ plugin extension by subclassing QQmlExtensionPlugin.

0
examples/qml/plugins/imports/TimeExample/Clock.qml → examples/qml/qmlextensionplugins/imports/TimeExample/Clock.qml
View File

0
examples/qml/plugins/imports/TimeExample/center.png → examples/qml/qmlextensionplugins/imports/TimeExample/center.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 765 B

After

Width:  |  Height:  |  Size: 765 B

0
examples/qml/plugins/imports/TimeExample/clock.png → examples/qml/qmlextensionplugins/imports/TimeExample/clock.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

0
examples/qml/plugins/imports/TimeExample/hour.png → examples/qml/qmlextensionplugins/imports/TimeExample/hour.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 625 B

After

Width:  |  Height:  |  Size: 625 B

0
examples/qml/plugins/imports/TimeExample/minute.png → examples/qml/qmlextensionplugins/imports/TimeExample/minute.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 625 B

After

Width:  |  Height:  |  Size: 625 B

0
examples/qml/plugins/imports/TimeExample/qmldir → examples/qml/qmlextensionplugins/imports/TimeExample/qmldir
View File

0
examples/qml/plugins/plugin.cpp → examples/qml/qmlextensionplugins/plugin.cpp
View File

0
examples/qml/plugins/plugins.qml → examples/qml/qmlextensionplugins/plugins.qml
View File

0
examples/qml/plugins/plugins.qmlproject → examples/qml/qmlextensionplugins/plugins.qmlproject
View File

7
examples/qml/plugins/plugins.pro → examples/qml/qmlextensionplugins/qmlextensionplugins.pro
View File

@ -16,9 +16,8 @@ pluginfiles.files += \
imports/TimeExample/minute.png imports/TimeExample/minute.png
qml.files = plugins.qml qml.files = plugins.qml
qml.path += $$[QT_INSTALL_EXAMPLES]/qml/plugins qml.path += $$[QT_INSTALL_EXAMPLES]/qml/qmlextensionplugins
target.path += $$[QT_INSTALL_EXAMPLES]/qml/plugins/imports/TimeExample target.path += $$[QT_INSTALL_EXAMPLES]/qml/qmlextensionplugins/imports/TimeExample
pluginfiles.path += $$[QT_INSTALL_EXAMPLES]/qml/plugins/imports/TimeExample pluginfiles.path += $$[QT_INSTALL_EXAMPLES]/qml/qmlextensionplugins/imports/TimeExample
INSTALLS += target qml pluginfiles INSTALLS += target qml pluginfiles