diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-07 17:06:03 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-07 17:07:44 +0100 |
commit | b907a01b467b551756b108f6c9a04d7e7382ae64 (patch) | |
tree | 2d21d785186ce485f615034e6667d9673b62a4fc /examples | |
parent | 4f8537ff8c9427705e3587861a62fe81cf3e503b (diff) | |
parent | 1d29d8edf8e4e709ca2f27791cdf8672c15488f3 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
examples/quick/textureprovider/etcprovider.h
src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp
src/qml/doc/qtqml.qdocconf
src/quick/doc/qtquick.qdocconf
tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
Change-Id: I5027b0ee024e00b9525bd45516b7f401ff7d4ae4
Diffstat (limited to 'examples')
9 files changed, 31 insertions, 10 deletions
diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro index 3ade5f2cbd..b5893c5a1e 100644 --- a/examples/qmltest/qmltest/qmltest.pro +++ b/examples/qmltest/qmltest/qmltest.pro @@ -1,11 +1,26 @@ TEMPLATE=app TARGET=tst_qmltestexample -CONFIG += qmltestcase + SOURCES += tst_qmltest.cpp -# Note: Normally, tests are auto-installed to a test-specific directory. Overwritten here -# so this one will end up in the examples tree. -target.path = $$[QT_INSTALL_EXAMPLES]/qmltest +!QTDIR_build { +# This is the code actual testcases should use: + +CONFIG += qmltestcase + +TESTDATA += tst_basic.qml tst_item.qml + +} else { +# This code exists solely for the purpose of building this example +# inside the examples/ hierarchy. + +QT += qml qmltest + +macx: CONFIG -= app_bundle + +target.path = $$[QT_INSTALL_EXAMPLES]/qmltest/qmltest qml.files = tst_basic.qml tst_item.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/qmltest +qml.path = $$[QT_INSTALL_EXAMPLES]/qmltest/qmltest INSTALLS += target qml + +} diff --git a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc index 818d76b7bf..1de194b962 100644 --- a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc +++ b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc @@ -38,7 +38,7 @@ \snippet quick/particles/imageparticle/content/allatonce.qml 0 Colored shows a simple ImageParticle with some color variation. - \snippet particles/imageparticle/content/colored.qml 0 + \snippet quick/particles/imageparticle/content/colored.qml 0 Color Table sets the color over life on the particles to provide a fixed rainbow effect. \snippet quick/particles/imageparticle/content/colortable.qml 0 diff --git a/examples/quick/particles/particles.pro b/examples/quick/particles/particles.pro index 9200113be8..2ea61751fb 100644 --- a/examples/quick/particles/particles.pro +++ b/examples/quick/particles/particles.pro @@ -6,6 +6,7 @@ SUBDIRS += affectors \ system EXAMPLE_FILES = \ + images.qrc \ itemparticle #Install shared images too diff --git a/examples/quick/shared/quick_shared.qrc b/examples/quick/shared/quick_shared.qrc index 9fc114dc89..74a964e5ef 100644 --- a/examples/quick/shared/quick_shared.qrc +++ b/examples/quick/shared/quick_shared.qrc @@ -4,5 +4,6 @@ <file>SimpleLauncherDelegate.qml</file> <file>Button.qml</file> <file>images/back.png</file> + <file>images/next.png</file> </qresource> </RCC> diff --git a/examples/quick/shared/shared.qrc b/examples/quick/shared/shared.qrc index 4ac856e66b..0c9f39e7b0 100644 --- a/examples/quick/shared/shared.qrc +++ b/examples/quick/shared/shared.qrc @@ -4,5 +4,6 @@ <file>SimpleLauncherDelegate.qml</file> <file>Button.qml</file> <file>images/back.png</file> + <file>images/next.png</file> </qresource> </RCC> diff --git a/examples/quick/textureprovider/etcprovider.h b/examples/quick/textureprovider/etcprovider.h index 4215ea297b..08418f8b4b 100644 --- a/examples/quick/textureprovider/etcprovider.h +++ b/examples/quick/textureprovider/etcprovider.h @@ -59,6 +59,7 @@ public: class EtcTexture : public QSGTexture { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qml.QmlOstPlugin") public: EtcTexture(); ~EtcTexture(); diff --git a/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp index f9b8ce6078..9da7a4a540 100644 --- a/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp @@ -52,6 +52,3 @@ void DialogPlugin::registerTypes(const char *uri){ //qRegisterMetaType<QQmlListProperty<QString> > ("QQmlListProperty<QString>"); } - -//FileDialog is the plugin name (same as the TARGET in the project file) and DialogPlugin is the plugin classs -Q_EXPORT_PLUGIN2(FileDialog, DialogPlugin); diff --git a/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h index 54b374621c..58248ffcac 100644 --- a/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h @@ -46,7 +46,7 @@ class DialogPlugin : public QQmlExtensionPlugin { Q_OBJECT - + Q_PLUGIN_METADATA(IID "org.qt-project.QmlExtensionPlugin.FileDialog") public: //registerTypes is inherited from QQmlExtensionPlugin void registerTypes(const char *uri); diff --git a/examples/quick/window/window/window.pro b/examples/quick/window/window/window.pro index e62decb733..3525a893fa 100644 --- a/examples/quick/window/window/window.pro +++ b/examples/quick/window/window/window.pro @@ -4,5 +4,10 @@ QT += qml SOURCES += window.cpp RESOURCES += window.qrc +EXAMPLE_FILES = \ + nogui.qml \ + standalone.qml \ + twowindows.qml + target.path = $$[QT_INSTALL_EXAMPLES]/quick/window/window INSTALLS = target |