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/widgets/dialogs | |
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/widgets/dialogs')
10 files changed, 9 insertions, 32 deletions
diff --git a/examples/widgets/dialogs/classwizard/classwizard.pro b/examples/widgets/dialogs/classwizard/classwizard.pro index 9802584d75..9b272b9d3f 100644 --- a/examples/widgets/dialogs/classwizard/classwizard.pro +++ b/examples/widgets/dialogs/classwizard/classwizard.pro @@ -5,9 +5,7 @@ RESOURCES = classwizard.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/classwizard -sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/classwizard -INSTALLS += target sources +INSTALLS += target QT += widgets simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/dialogs/configdialog/configdialog.pro b/examples/widgets/dialogs/configdialog/configdialog.pro index fbef658523..616b5fd650 100644 --- a/examples/widgets/dialogs/configdialog/configdialog.pro +++ b/examples/widgets/dialogs/configdialog/configdialog.pro @@ -7,9 +7,7 @@ RESOURCES += configdialog.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/configdialog -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/configdialog -INSTALLS += target sources +INSTALLS += target wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib diff --git a/examples/widgets/dialogs/dialogs.pro b/examples/widgets/dialogs/dialogs.pro index af916ea029..ab33609bcd 100644 --- a/examples/widgets/dialogs/dialogs.pro +++ b/examples/widgets/dialogs/dialogs.pro @@ -11,9 +11,4 @@ SUBDIRS = classwizard \ wince*: SUBDIRS += sipdialog -# install -sources.files = README *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs -INSTALLS += sources - QT += widgets diff --git a/examples/widgets/dialogs/extension/extension.pro b/examples/widgets/dialogs/extension/extension.pro index 91eccf5a72..e7cf493128 100644 --- a/examples/widgets/dialogs/extension/extension.pro +++ b/examples/widgets/dialogs/extension/extension.pro @@ -4,9 +4,7 @@ SOURCES = finddialog.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/extension -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/extension -INSTALLS += target sources +INSTALLS += target QT += widgets simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/dialogs/findfiles/findfiles.pro b/examples/widgets/dialogs/findfiles/findfiles.pro index fe4ec427d3..f02ec69e4c 100644 --- a/examples/widgets/dialogs/findfiles/findfiles.pro +++ b/examples/widgets/dialogs/findfiles/findfiles.pro @@ -4,8 +4,6 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/findfiles -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/findfiles -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/dialogs/licensewizard/licensewizard.pro b/examples/widgets/dialogs/licensewizard/licensewizard.pro index 8d5bed4858..4bcfdad384 100644 --- a/examples/widgets/dialogs/licensewizard/licensewizard.pro +++ b/examples/widgets/dialogs/licensewizard/licensewizard.pro @@ -5,9 +5,7 @@ RESOURCES = licensewizard.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/licensewizard -sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/licensewizard -INSTALLS += target sources +INSTALLS += target QT += widgets printsupport simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/dialogs/sipdialog/sipdialog.pro b/examples/widgets/dialogs/sipdialog/sipdialog.pro index 57b4ac6331..5e24335e8c 100644 --- a/examples/widgets/dialogs/sipdialog/sipdialog.pro +++ b/examples/widgets/dialogs/sipdialog/sipdialog.pro @@ -4,9 +4,7 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/sipdialog -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/sipdialog -INSTALLS += target sources +INSTALLS += target wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib diff --git a/examples/widgets/dialogs/standarddialogs/standarddialogs.pro b/examples/widgets/dialogs/standarddialogs/standarddialogs.pro index 86bc7c46b1..89d0ad9a39 100644 --- a/examples/widgets/dialogs/standarddialogs/standarddialogs.pro +++ b/examples/widgets/dialogs/standarddialogs/standarddialogs.pro @@ -4,9 +4,7 @@ SOURCES = dialog.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/standarddialogs -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/standarddialogs -INSTALLS += target sources +INSTALLS += target wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib diff --git a/examples/widgets/dialogs/tabdialog/tabdialog.pro b/examples/widgets/dialogs/tabdialog/tabdialog.pro index 9c62dfb608..656c661844 100644 --- a/examples/widgets/dialogs/tabdialog/tabdialog.pro +++ b/examples/widgets/dialogs/tabdialog/tabdialog.pro @@ -4,9 +4,7 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/tabdialog -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/tabdialog -INSTALLS += target sources +INSTALLS += target wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib QT += widgets diff --git a/examples/widgets/dialogs/trivialwizard/trivialwizard.pro b/examples/widgets/dialogs/trivialwizard/trivialwizard.pro index cf3d7316f5..63831e8576 100644 --- a/examples/widgets/dialogs/trivialwizard/trivialwizard.pro +++ b/examples/widgets/dialogs/trivialwizard/trivialwizard.pro @@ -2,9 +2,7 @@ SOURCES = trivialwizard.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/trivialwizard -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/trivialwizard -INSTALLS += target sources +INSTALLS += target QT += widgets simulator: warning(This example might not fully work on Simulator platform) |