Commit aba67cc3 authored by Christian Kandeler's avatar Christian Kandeler Committed by The Qt Project
Browse files

Fix installation of examples.


Enable examples to be built in the target tree. This entails installing
the project files and possibly other missing stuff.
Task-number: QTBUG-27977

Change-Id: I159fd8e3ebc7077e1d68e085c4947acc058ce594
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 8fc95e65
Branches
Tags
No related merge requests found
Showing with 71 additions and 27 deletions
...@@ -6,4 +6,6 @@ SOURCES += main.cpp ...@@ -6,4 +6,6 @@ SOURCES += main.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/calqlatr target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/calqlatr
qml.files = calqlatr.qml content qml.files = calqlatr.qml content
qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/calqlatr qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/calqlatr
INSTALLS += target qml sources.files = $$SOURCES calqlatr.pro
sources.path = $$qml.path
INSTALLS += target sources qml
...@@ -4,3 +4,8 @@ SUBDIRS = calqlatr \ ...@@ -4,3 +4,8 @@ SUBDIRS = calqlatr \
tweetsearch \ tweetsearch \
maroon \ maroon \
stocqt stocqt
# install
sources.files = demos.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos
INSTALLS += sources
...@@ -6,4 +6,6 @@ SOURCES += main.cpp ...@@ -6,4 +6,6 @@ SOURCES += main.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/maroon target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/maroon
qml.files = maroon.qml content qml.files = maroon.qml content
qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/maroon qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/maroon
INSTALLS += target qml sources.files = $$SOURCES maroon.pro
sources.path = $$qml.path
INSTALLS += sources target qml
...@@ -6,4 +6,6 @@ SOURCES += main.cpp ...@@ -6,4 +6,6 @@ SOURCES += main.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/samegame target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/samegame
qml.files = samegame.qml content settings.js qml.files = samegame.qml content settings.js
qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/samegame qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/samegame
INSTALLS += target qml sources.files = $$SOURCES samegame.pro
sources.path = $$qml.path
INSTALLS += sources target qml
...@@ -6,4 +6,6 @@ SOURCES += main.cpp ...@@ -6,4 +6,6 @@ SOURCES += main.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/stocqt target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/stocqt
qml.files = stocqt.qml content qml.files = stocqt.qml content
qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/stocqt qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/stocqt
INSTALLS += target qml sources.files = $$SOURCES stocqt.pro
sources.path = $$qml.path
INSTALLS += sources target qml
...@@ -6,4 +6,6 @@ SOURCES += main.cpp ...@@ -6,4 +6,6 @@ SOURCES += main.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/tweetsearch target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/tweetsearch
qml.files = tweetsearch.qml content qml.files = tweetsearch.qml content
qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/tweetsearch qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/tweetsearch
INSTALLS += target qml sources.files = $$SOURCES tweetsearch.pro
sources.path = $$qml.path
INSTALLS += sources target qml
...@@ -9,3 +9,8 @@ SUBDIRS += \ ...@@ -9,3 +9,8 @@ SUBDIRS += \
tutorials \ tutorials \
window \ window \
qmltest qmltest
# install
sources.files = shared examples.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/
INSTALLS += sources
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS += localstorage SUBDIRS += localstorage
# install
sources.files = localstorage.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/localstorage
INSTALLS += sources
...@@ -3,7 +3,9 @@ TEMPLATE = app ...@@ -3,7 +3,9 @@ TEMPLATE = app
QT += quick qml QT += quick qml
SOURCES += main.cpp SOURCES += main.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/localstorage target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/localstorage/localstorage
qml.files = localstorage.qml hello.qml qml.files = localstorage.qml hello.qml
qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/localstorage qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/localstorage/localstorage
INSTALLS += target qml sources.files = $$SOURCES localstorage.pro
sources.path = $$qml.path
INSTALLS += sources target qml
...@@ -6,5 +6,6 @@ SOURCES += main.cpp ...@@ -6,5 +6,6 @@ SOURCES += main.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/affectors target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/affectors
qml.files = affectors.qml content qml.files = affectors.qml content
qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/affectors qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/affectors
INSTALLS += target qml sources.files = $$SOURCES affectors.pro
sources.path = $$qml.path
INSTALLS += sources target qml
...@@ -6,5 +6,6 @@ SOURCES += main.cpp ...@@ -6,5 +6,6 @@ SOURCES += main.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/customparticle target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/customparticle
qml.files = customparticle.qml content qml.files = customparticle.qml content
qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/customparticle qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/customparticle
INSTALLS += target qml sources.files = $$SOURCES customparticle.pro
sources.path = $$qml.path
INSTALLS += sources target qml
...@@ -6,5 +6,6 @@ SOURCES += main.cpp ...@@ -6,5 +6,6 @@ SOURCES += main.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/emitters target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/emitters
qml.files = emitters.qml content qml.files = emitters.qml content
qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/emitters qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/emitters
INSTALLS += target qml sources.files = $$SOURCES emitters.pro
sources.path = $$qml.path
INSTALLS += sources target qml
...@@ -6,5 +6,6 @@ SOURCES += main.cpp ...@@ -6,5 +6,6 @@ SOURCES += main.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/imageparticle target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/imageparticle
qml.files = imageparticle.qml content qml.files = imageparticle.qml content
qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/imageparticle qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/imageparticle
INSTALLS += target qml sources.files = $$SOURCES imageparticle.pro
sources.path = $$qml.path
INSTALLS += sources target qml
...@@ -8,4 +8,6 @@ SUBDIRS += affectors \ ...@@ -8,4 +8,6 @@ SUBDIRS += affectors \
#Install shared images too #Install shared images too
qml.files = images qml.files = images
qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles
INSTALLS = qml sources.files = particles.pro
sources.path = $$qml.path
INSTALLS = sources qml
...@@ -6,5 +6,6 @@ SOURCES += main.cpp ...@@ -6,5 +6,6 @@ SOURCES += main.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/system target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/system
qml.files = system.qml content qml.files = system.qml content
qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/system qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/system
INSTALLS += target qml sources.files = $$SOURCES system.pro
sources.path = $$qml.path
INSTALLS += sources target qml
...@@ -9,7 +9,7 @@ SOURCES += imageprovider.cpp ...@@ -9,7 +9,7 @@ SOURCES += imageprovider.cpp
OTHER_FILES += imageprovider.json OTHER_FILES += imageprovider.json
sources.files = $$SOURCES imageprovider.qml imageprovider.pro sources.files = $$SOURCES imageprovider.qml imageprovider.pro $$OTHER_FILES
sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider
target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider/ImageProviderCore target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider/ImageProviderCore
...@@ -19,4 +19,3 @@ ImageProviderCore_sources.files = \ ...@@ -19,4 +19,3 @@ ImageProviderCore_sources.files = \
ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider/ImageProviderCore ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider/ImageProviderCore
INSTALLS = sources ImageProviderCore_sources target INSTALLS = sources ImageProviderCore_sources target
...@@ -2,3 +2,9 @@ QT += qml quick network ...@@ -2,3 +2,9 @@ QT += qml quick network
SOURCES += main.cpp SOURCES += main.cpp
RESOURCES += networkaccessmanagerfactory.qrc 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
...@@ -5,3 +5,8 @@ SUBDIRS +=imageprovider \ ...@@ -5,3 +5,8 @@ SUBDIRS +=imageprovider \
networkaccessmanagerfactory \ networkaccessmanagerfactory \
referenceexamples \ referenceexamples \
shell shell
#Install
sources.files = qml.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml
INSTALLS += sources
...@@ -5,7 +5,7 @@ SOURCES += main.cpp \ ...@@ -5,7 +5,7 @@ SOURCES += main.cpp \
HEADERS += person.h HEADERS += person.h
RESOURCES += adding.qrc RESOURCES += adding.qrc
target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/adding target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/adding
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS adding.pro sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS adding.pro example.qml
sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/adding sources.path = $$target.path
INSTALLS += target sources INSTALLS += target sources
...@@ -7,7 +7,7 @@ HEADERS += person.h \ ...@@ -7,7 +7,7 @@ HEADERS += person.h \
birthdayparty.h birthdayparty.h
RESOURCES += attached.qrc RESOURCES += attached.qrc
target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/attached target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/attached
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS attached.pro sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS attached.pro example.qml
sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/attached sources.path = $$target.path
INSTALLS += target sources INSTALLS += target sources
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment