From aeb036ed8715d0c099d3dca87f7def4dbaf8e9b4 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 27 Nov 2012 20:40:16 +0100 Subject: centralize and fixup example sources install targets it's confusing for the users if the examples' project files contain code to install their own sources. also, this constitutes an enormous code duplication, and lots of mistakes. consequently, automate it. more or less as a side effect, this also removes the entirely meaningless target installs in subdirs projects. Task-number: QTBUG-28184 Change-Id: I9fc1367a06db9e2c46aeb67d68729a4f67163ef9 Reviewed-by: hjk --- examples/qpa/qpa.pro | 6 ------ examples/qpa/windows/windows.pro | 4 +--- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'examples/qpa') diff --git a/examples/qpa/qpa.pro b/examples/qpa/qpa.pro index 0eabfa8cf2..6f07e50fd8 100644 --- a/examples/qpa/qpa.pro +++ b/examples/qpa/qpa.pro @@ -1,8 +1,2 @@ TEMPLATE = subdirs SUBDIRS = windows - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qpa -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qpa.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qpa -INSTALLS += target sources diff --git a/examples/qpa/windows/windows.pro b/examples/qpa/windows/windows.pro index f0d53af625..cf2b7ab200 100644 --- a/examples/qpa/windows/windows.pro +++ b/examples/qpa/windows/windows.pro @@ -6,6 +6,4 @@ SOURCES += window.cpp main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/qpa/windows -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS windows.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qpa/windows -INSTALLS += target sources +INSTALLS += target -- cgit v1.2.3