diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-27 20:40:16 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-29 20:21:11 +0100 |
commit | aeb036ed8715d0c099d3dca87f7def4dbaf8e9b4 (patch) | |
tree | 95a679c8b456c61bc108e1a68b0aced288313df6 /examples/threads | |
parent | 12dcab77a7248268c58c2c5431c2c237e14d1089 (diff) |
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 <qthjk@ovi.com>
Diffstat (limited to 'examples/threads')
-rw-r--r-- | examples/threads/mandelbrot/mandelbrot.pro | 4 | ||||
-rw-r--r-- | examples/threads/queuedcustomtype/queuedcustomtype.pro | 4 | ||||
-rw-r--r-- | examples/threads/semaphores/semaphores.pro | 4 | ||||
-rw-r--r-- | examples/threads/threads.pro | 6 | ||||
-rw-r--r-- | examples/threads/waitconditions/waitconditions.pro | 4 |
5 files changed, 4 insertions, 18 deletions
diff --git a/examples/threads/mandelbrot/mandelbrot.pro b/examples/threads/mandelbrot/mandelbrot.pro index a2088cb8b0..08c320fff6 100644 --- a/examples/threads/mandelbrot/mandelbrot.pro +++ b/examples/threads/mandelbrot/mandelbrot.pro @@ -8,8 +8,6 @@ unix:!mac:!vxworks:!integrity:LIBS += -lm # install target.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mandelbrot.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/threads/queuedcustomtype/queuedcustomtype.pro b/examples/threads/queuedcustomtype/queuedcustomtype.pro index a2da59e55f..8b18b13ba6 100644 --- a/examples/threads/queuedcustomtype/queuedcustomtype.pro +++ b/examples/threads/queuedcustomtype/queuedcustomtype.pro @@ -9,8 +9,6 @@ QT += widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mandelbrot.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot -INSTALLS += target sources +INSTALLS += target diff --git a/examples/threads/semaphores/semaphores.pro b/examples/threads/semaphores/semaphores.pro index 49690a6b4b..ec199fa3c2 100644 --- a/examples/threads/semaphores/semaphores.pro +++ b/examples/threads/semaphores/semaphores.pro @@ -6,9 +6,7 @@ CONFIG += console # install target.path = $$[QT_INSTALL_EXAMPLES]/threads/semaphores -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS semaphores.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/threads/semaphores -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/threads/threads.pro b/examples/threads/threads.pro index a97861d856..1ab89c4e0a 100644 --- a/examples/threads/threads.pro +++ b/examples/threads/threads.pro @@ -3,9 +3,3 @@ SUBDIRS = semaphores \ waitconditions !contains(QT_CONFIG, no-widgets):SUBDIRS += mandelbrot - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/threads -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS threads.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/threads -INSTALLS += target sources diff --git a/examples/threads/waitconditions/waitconditions.pro b/examples/threads/waitconditions/waitconditions.pro index a8298266f8..d077e6ca12 100644 --- a/examples/threads/waitconditions/waitconditions.pro +++ b/examples/threads/waitconditions/waitconditions.pro @@ -6,8 +6,6 @@ SOURCES += waitconditions.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/threads/waitconditions -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS waitconditions.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/threads/waitconditions -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) |