From e886cc7b24e920d85b239e05911e5dbd5d5f29f3 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 21 Nov 2012 15:25:55 +0100 Subject: Fix building of installed examples. - Correct install paths - Add missing resources. Task-number: QTBUG-27977 Change-Id: Ie31cc31a208393dd8dfce87b067b81d986dc946e Reviewed-by: Christian Kandeler --- examples/embedded/desktopservices/desktopservices.pro | 2 +- examples/embedded/embedded.pro | 5 +++++ examples/embedded/fluidlauncher/fluidlauncher.pro | 11 +++++------ examples/embedded/weatherinfo/weatherinfo.pro | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) (limited to 'examples/embedded') diff --git a/examples/embedded/desktopservices/desktopservices.pro b/examples/embedded/desktopservices/desktopservices.pro index 9547d29..c8fc140 100644 --- a/examples/embedded/desktopservices/desktopservices.pro +++ b/examples/embedded/desktopservices/desktopservices.pro @@ -9,7 +9,7 @@ music.files = data/*.mp3 data/*.wav image.files = data/*.png target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/desktopservices -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro +sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro resources data sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/desktopservices wince*{ diff --git a/examples/embedded/embedded.pro b/examples/embedded/embedded.pro index 09cbcd2..07554b8 100644 --- a/examples/embedded/embedded.pro +++ b/examples/embedded/embedded.pro @@ -1,3 +1,8 @@ TEMPLATE = subdirs !contains(QT_CONFIG, no-widgets): SUBDIRS += desktopservices fluidlauncher weatherinfo QT+=widgets + +# install +sources.files = embedded.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded +INSTALLS += sources diff --git a/examples/embedded/fluidlauncher/fluidlauncher.pro b/examples/embedded/fluidlauncher/fluidlauncher.pro index 558e052..7ea5edc 100644 --- a/examples/embedded/fluidlauncher/fluidlauncher.pro +++ b/examples/embedded/fluidlauncher/fluidlauncher.pro @@ -15,12 +15,11 @@ SOURCES += \ pictureflow.cpp \ slideshow.cpp -embedded{ - target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/fluidlauncher - sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html config.xml screenshots slides - sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/fluidlauncher - INSTALLS += target sources -} + +target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/fluidlauncher +sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html config.xml screenshots slides +sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/fluidlauncher +INSTALLS += target sources wince*{ QT += svg diff --git a/examples/embedded/weatherinfo/weatherinfo.pro b/examples/embedded/weatherinfo/weatherinfo.pro index 4ff9a73..4bed5d0 100644 --- a/examples/embedded/weatherinfo/weatherinfo.pro +++ b/examples/embedded/weatherinfo/weatherinfo.pro @@ -5,7 +5,7 @@ RESOURCES = weatherinfo.qrc QT += network svg target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/weatherinfo -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro icons sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/weatherinfo INSTALLS += target sources QT+=widgets -- cgit v1.2.1