From a6065d60f158ffad7a94877883af69731da94295 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 29 Nov 2012 16:02:34 +0100 Subject: centralize and fixup example sources install targets follow respective change in qtbase Change-Id: I27502eb7ebea973e19ec5f7c3ec0e2338556f6e0 Reviewed-by: Oswald Buddenhagen Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> --- examples/qml/imageprovider/imageprovider.pro | 16 +++++----------- .../networkaccessmanagerfactory.pro | 7 ++----- examples/qml/plugins/plugins.pro | 13 ++++++------- examples/qml/qml.pro | 13 +++++++------ examples/qml/referenceexamples/adding/adding.pro | 6 ++---- examples/qml/referenceexamples/attached/attached.pro | 6 ++---- examples/qml/referenceexamples/binding/binding.pro | 8 +++----- examples/qml/referenceexamples/coercion/coercion.pro | 6 ++---- examples/qml/referenceexamples/default/default.pro | 6 ++---- examples/qml/referenceexamples/extended/extended.pro | 6 ++---- examples/qml/referenceexamples/grouped/grouped.pro | 6 ++---- examples/qml/referenceexamples/methods/methods.pro | 6 ++---- examples/qml/referenceexamples/properties/properties.pro | 6 ++---- examples/qml/referenceexamples/referenceexamples.pro | 4 ---- examples/qml/referenceexamples/signal/signal.pro | 6 ++---- .../qml/referenceexamples/valuesource/valuesource.pro | 6 ++---- examples/qml/shell/shell.pro | 6 ++---- examples/qml/xmlhttprequest/main.cpp | 4 ++-- examples/qml/xmlhttprequest/xmlhttprequest.pro | 7 +++++-- examples/qml/xmlhttprequest/xmlhttprequest.qml | 2 +- 20 files changed, 53 insertions(+), 87 deletions(-) (limited to 'examples/qml') diff --git a/examples/qml/imageprovider/imageprovider.pro b/examples/qml/imageprovider/imageprovider.pro index 135f4da627..d1dd321b72 100644 --- a/examples/qml/imageprovider/imageprovider.pro +++ b/examples/qml/imageprovider/imageprovider.pro @@ -7,15 +7,9 @@ TARGET = qmlimageproviderplugin SOURCES += imageprovider.cpp -OTHER_FILES += imageprovider.json +EXAMPLE_FILES = imageprovider-example.qml -sources.files = $$SOURCES imageprovider.qml imageprovider.pro $$OTHER_FILES -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider - -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider/ImageProviderCore - -ImageProviderCore_sources.files = \ - ImageProviderCore/qmldir -ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider/ImageProviderCore - -INSTALLS = sources ImageProviderCore_sources target +target.path = $$[QT_INSTALL_EXAMPLES]/qml/imageprovider/ImageProviderCore +qml.files = ImageProviderCore/qmldir +qml.path = $$[QT_INSTALL_EXAMPLES]/qml/imageprovider/ImageProviderCore +INSTALLS = target qml diff --git a/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro index 3195dfd7a2..222cc71c46 100644 --- a/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro +++ b/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro @@ -3,8 +3,5 @@ QT += qml quick network SOURCES += main.cpp RESOURCES += networkaccessmanagerfactory.qrc -sources.files = $$SOURCES $$RESOURCES networkaccessmanagerfactory.pro view.qml -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/networkaccessmanagerfactory -target.path = $$sources.path - -INSTALLS = sources target +target.path = $$[QT_INSTALL_EXAMPLES]/qml/networkaccessmanagerfactory +INSTALLS = target diff --git a/examples/qml/plugins/plugins.pro b/examples/qml/plugins/plugins.pro index 66af7d3c07..6f8cb37f93 100644 --- a/examples/qml/plugins/plugins.pro +++ b/examples/qml/plugins/plugins.pro @@ -7,7 +7,7 @@ TARGET = qmlqtimeexampleplugin SOURCES += plugin.cpp -qdeclarativesources.files += \ +pluginfiles.files += \ imports/TimeExample/qmldir \ imports/TimeExample/center.png \ imports/TimeExample/clock.png \ @@ -15,11 +15,10 @@ qdeclarativesources.files += \ imports/TimeExample/hour.png \ imports/TimeExample/minute.png -qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/plugins/imports/TimeExample +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 -sources.files += plugins.pro plugin.cpp plugins.qml -sources.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/plugins -target.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/plugins/imports/TimeExample - -INSTALLS += qdeclarativesources sources target +INSTALLS += target qml pluginfiles diff --git a/examples/qml/qml.pro b/examples/qml/qml.pro index 6bc620fbf0..a66d08a8b7 100644 --- a/examples/qml/qml.pro +++ b/examples/qml/qml.pro @@ -1,12 +1,13 @@ TEMPLATE = subdirs SUBDIRS +=imageprovider \ - plugins \ networkaccessmanagerfactory \ + plugins \ referenceexamples \ - shell + shell \ + xmlhttprequest -#Install -sources.files = qml.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml -INSTALLS += sources +EXAMPLE_FILES = \ + dynamicscene \ + i18n \ + locale diff --git a/examples/qml/referenceexamples/adding/adding.pro b/examples/qml/referenceexamples/adding/adding.pro index a6c2fc65ed..86c830bda9 100644 --- a/examples/qml/referenceexamples/adding/adding.pro +++ b/examples/qml/referenceexamples/adding/adding.pro @@ -5,7 +5,5 @@ SOURCES += main.cpp \ HEADERS += person.h RESOURCES += adding.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/adding -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS adding.pro example.qml -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/adding +INSTALLS += target diff --git a/examples/qml/referenceexamples/attached/attached.pro b/examples/qml/referenceexamples/attached/attached.pro index 247db55cee..1225a5fcfd 100644 --- a/examples/qml/referenceexamples/attached/attached.pro +++ b/examples/qml/referenceexamples/attached/attached.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += attached.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/attached -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS attached.pro example.qml -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/attached +INSTALLS += target diff --git a/examples/qml/referenceexamples/binding/binding.pro b/examples/qml/referenceexamples/binding/binding.pro index 86787c7654..3c1f9565ed 100644 --- a/examples/qml/referenceexamples/binding/binding.pro +++ b/examples/qml/referenceexamples/binding/binding.pro @@ -7,9 +7,7 @@ SOURCES += main.cpp \ HEADERS += person.h \ birthdayparty.h \ happybirthdaysong.h - RESOURCES += binding.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/binding -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS binding.pro example.qml -sources.path = $$target.path -INSTALLS += target sources + +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/binding +INSTALLS += target diff --git a/examples/qml/referenceexamples/coercion/coercion.pro b/examples/qml/referenceexamples/coercion/coercion.pro index e053ac21cb..c501b9cda2 100644 --- a/examples/qml/referenceexamples/coercion/coercion.pro +++ b/examples/qml/referenceexamples/coercion/coercion.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += coercion.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/coercion -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS coercion.pro example.qml -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/coercion +INSTALLS += target diff --git a/examples/qml/referenceexamples/default/default.pro b/examples/qml/referenceexamples/default/default.pro index 80bee64461..db4b88413b 100644 --- a/examples/qml/referenceexamples/default/default.pro +++ b/examples/qml/referenceexamples/default/default.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += default.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/default -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS default.pro example.qml -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/default +INSTALLS += target diff --git a/examples/qml/referenceexamples/extended/extended.pro b/examples/qml/referenceexamples/extended/extended.pro index 5b21d90447..b38a1753b9 100644 --- a/examples/qml/referenceexamples/extended/extended.pro +++ b/examples/qml/referenceexamples/extended/extended.pro @@ -5,7 +5,5 @@ SOURCES += main.cpp \ HEADERS += lineedit.h RESOURCES += extended.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/extended -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extended.pro example.qml -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/extended +INSTALLS += target diff --git a/examples/qml/referenceexamples/grouped/grouped.pro b/examples/qml/referenceexamples/grouped/grouped.pro index afd1c15668..7014d9680d 100644 --- a/examples/qml/referenceexamples/grouped/grouped.pro +++ b/examples/qml/referenceexamples/grouped/grouped.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += grouped.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/grouped -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grouped.pro example.qml -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/grouped +INSTALLS += target diff --git a/examples/qml/referenceexamples/methods/methods.pro b/examples/qml/referenceexamples/methods/methods.pro index a7dd996532..c1be0713e6 100644 --- a/examples/qml/referenceexamples/methods/methods.pro +++ b/examples/qml/referenceexamples/methods/methods.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += methods.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/methods -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS methods.pro example.qml -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/methods +INSTALLS += target diff --git a/examples/qml/referenceexamples/properties/properties.pro b/examples/qml/referenceexamples/properties/properties.pro index c1cf877e65..cd1ffeddcc 100644 --- a/examples/qml/referenceexamples/properties/properties.pro +++ b/examples/qml/referenceexamples/properties/properties.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += properties.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/properties -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS properties.pro example.qml -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/properties +INSTALLS += target diff --git a/examples/qml/referenceexamples/referenceexamples.pro b/examples/qml/referenceexamples/referenceexamples.pro index 5f514bc1db..4bfbd488ea 100644 --- a/examples/qml/referenceexamples/referenceexamples.pro +++ b/examples/qml/referenceexamples/referenceexamples.pro @@ -13,7 +13,3 @@ SUBDIRS += \ methods !contains(QT_CONFIG, no-widgets): SUBDIRS += extended - -sources.files = referenceexamples.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples -INSTALLS += sources diff --git a/examples/qml/referenceexamples/signal/signal.pro b/examples/qml/referenceexamples/signal/signal.pro index 5a021ebae0..81692d3676 100644 --- a/examples/qml/referenceexamples/signal/signal.pro +++ b/examples/qml/referenceexamples/signal/signal.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += signal.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/signal -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS signal.pro example.qml -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/signal +INSTALLS += target diff --git a/examples/qml/referenceexamples/valuesource/valuesource.pro b/examples/qml/referenceexamples/valuesource/valuesource.pro index d7aafb7d10..4ec77ff83b 100644 --- a/examples/qml/referenceexamples/valuesource/valuesource.pro +++ b/examples/qml/referenceexamples/valuesource/valuesource.pro @@ -9,7 +9,5 @@ HEADERS += person.h \ happybirthdaysong.h RESOURCES += valuesource.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/valuesource -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS valuesource.pro example.qml -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/valuesource +INSTALLS += target diff --git a/examples/qml/shell/shell.pro b/examples/qml/shell/shell.pro index b57d550d31..da97590189 100644 --- a/examples/qml/shell/shell.pro +++ b/examples/qml/shell/shell.pro @@ -5,7 +5,5 @@ mac:CONFIG -= app_bundle SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/shell -sources.files = $$SOURCES shell.pro -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/shell +INSTALLS += target diff --git a/examples/qml/xmlhttprequest/main.cpp b/examples/qml/xmlhttprequest/main.cpp index 976a462464..25f3759de5 100644 --- a/examples/qml/xmlhttprequest/main.cpp +++ b/examples/qml/xmlhttprequest/main.cpp @@ -37,5 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(xmlhttprequest) \ No newline at end of file +#include "../../quick/shared/shared.h" +DECLARATIVE_EXAMPLE_MAIN(xmlhttprequest) diff --git a/examples/qml/xmlhttprequest/xmlhttprequest.pro b/examples/qml/xmlhttprequest/xmlhttprequest.pro index bb7fae66bf..5af32eeab6 100644 --- a/examples/qml/xmlhttprequest/xmlhttprequest.pro +++ b/examples/qml/xmlhttprequest/xmlhttprequest.pro @@ -3,7 +3,10 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/xmlhttprequest +EXAMPLE_FILES = \ + data.xml + +target.path = $$[QT_INSTALL_EXAMPLES]/qml/xmlhttprequest qml.files = xmlhttprequest.qml get.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/xmlhttprequest +qml.path = $$[QT_INSTALL_EXAMPLES]/qml/xmlhttprequest INSTALLS += target qml diff --git a/examples/qml/xmlhttprequest/xmlhttprequest.qml b/examples/qml/xmlhttprequest/xmlhttprequest.qml index b9bf4548cb..b483ac1aa0 100644 --- a/examples/qml/xmlhttprequest/xmlhttprequest.qml +++ b/examples/qml/xmlhttprequest/xmlhttprequest.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "../../shared" as Examples +import "../../quick/shared" as Examples Item { height: 480 -- cgit v1.2.3