From 1cdbd299884a2978a76d5d4bd4fccf4d64b1d708 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 17 Jan 2013 09:17:58 +0100 Subject: Remove outdated macro usage Change-Id: I4b58f3d74d7dec9a95a07b907c500990630e7762 Reviewed-by: Jerome Pasion Reviewed-by: Kai Koehne --- .../gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp | 3 --- .../tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'examples') diff --git a/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp index d71e622b33..79b890c097 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"); } - -//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 82035193c8..6776f91e2b 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); -- cgit v1.2.3 From 6c18353123f22c1279258f8ccbd7c45c98bd0980 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 24 Jan 2013 18:32:19 +0100 Subject: fix installation of qmltestcase example split the project along the built-as-part-of-qt line: in qt, it must comply with the installation rules for examples, and it shouldn't be an actual test case - our CI is not supposed to run it ... the stand-alone build (which users are supposed to make use of) needed adding TESTDATA for proper installation. Change-Id: I1bbf7b1204410c5eb8755477310bb023e8f87623 Reviewed-by: Alan Alpert --- examples/qmltest/qmltest/qmltest.pro | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro index 3ade5f2cbd..f290fd21e1 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. +!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 qml.files = tst_basic.qml tst_item.qml qml.path = $$[QT_INSTALL_EXAMPLES]/qmltest INSTALLS += target qml + +} -- cgit v1.2.3 From 99cf339f964218ee0762aa6f95189b2cac3a1240 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 24 Jan 2013 21:20:45 +0100 Subject: mark forgotten EXAMPLE_FILES Change-Id: I83c7706479ea3afd45ab9c97f63f68d416b28f55 Reviewed-by: Alan Alpert --- examples/quick/particles/particles.pro | 1 + examples/quick/window/window/window.pro | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'examples') 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/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 -- cgit v1.2.3 From 8fcecca8d29cfe5946040a12b3fa73432a89ae76 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 24 Jan 2013 21:37:24 +0100 Subject: fix qmltest example install path Change-Id: I267155bb34b8226331fc2951521dc7b8643a014c Reviewed-by: Alan Alpert --- examples/qmltest/qmltest/qmltest.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro index f290fd21e1..b5893c5a1e 100644 --- a/examples/qmltest/qmltest/qmltest.pro +++ b/examples/qmltest/qmltest/qmltest.pro @@ -18,9 +18,9 @@ QT += qml qmltest macx: CONFIG -= app_bundle -target.path = $$[QT_INSTALL_EXAMPLES]/qmltest +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 } -- cgit v1.2.3 From a717da652a767fb276b2bff7c90f53e768933195 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Mon, 28 Jan 2013 12:17:24 +0100 Subject: Doc: corrected path to snippet Added "quick" to path in imageparticle.qdoc Task-number: QTBUG-29101 Change-Id: If328cde08f46b720defa1953916753ba9d9836a8 Reviewed-by: Jerome Pasion --- examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc index 62c1a06839..e72a90349e 100644 --- a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc +++ b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc @@ -38,7 +38,7 @@ \snippet 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 particles/imageparticle/content/colortable.qml 0 -- cgit v1.2.3