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/widgets/tutorials/modelview/1_readonly/1_readonly.pro | 4 +--- examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro | 4 +--- .../widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro | 4 +--- examples/widgets/tutorials/modelview/4_headers/4_headers.pro | 4 +--- examples/widgets/tutorials/modelview/5_edit/5_edit.pro | 4 +--- examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro | 4 +--- examples/widgets/tutorials/modelview/7_selections/7_selections.pro | 4 +--- examples/widgets/tutorials/modelview/modelview.pro | 4 +--- 8 files changed, 8 insertions(+), 24 deletions(-) (limited to 'examples/widgets/tutorials/modelview') diff --git a/examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro b/examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro index 4aa8ed1039..cf066c6b31 100644 --- a/examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro +++ b/examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro @@ -10,9 +10,7 @@ HEADERS += mymodel.h # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/1_readonly -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 1_readonly.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/1_readonly -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro b/examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro index 668b2570cf..057196b7c6 100644 --- a/examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro +++ b/examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro @@ -9,9 +9,7 @@ HEADERS += mymodel.h # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/2_formatting -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 2_formatting.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/2_formatting -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro b/examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro index 8993d7149b..92a1bbf4e5 100644 --- a/examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro +++ b/examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro @@ -9,9 +9,7 @@ HEADERS += mymodel.h # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/3_changingmodel -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 3_changingmodel.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/3_changingmodel -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/modelview/4_headers/4_headers.pro b/examples/widgets/tutorials/modelview/4_headers/4_headers.pro index a343b63fdb..186ea888e0 100644 --- a/examples/widgets/tutorials/modelview/4_headers/4_headers.pro +++ b/examples/widgets/tutorials/modelview/4_headers/4_headers.pro @@ -9,9 +9,7 @@ HEADERS += mymodel.h # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/4_headers -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 4_headers.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/4_headers -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/modelview/5_edit/5_edit.pro b/examples/widgets/tutorials/modelview/5_edit/5_edit.pro index cea272439e..b4727580af 100644 --- a/examples/widgets/tutorials/modelview/5_edit/5_edit.pro +++ b/examples/widgets/tutorials/modelview/5_edit/5_edit.pro @@ -11,9 +11,7 @@ HEADERS += mainwindow.h \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/5_edit -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 5_edit.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/5_edit -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro b/examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro index 1e35d6cd67..af3208f9c8 100644 --- a/examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro +++ b/examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro @@ -6,9 +6,7 @@ HEADERS += mainwindow.h # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/6_treeview -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 6_treeview.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/6_treeview -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/modelview/7_selections/7_selections.pro b/examples/widgets/tutorials/modelview/7_selections/7_selections.pro index f3eaac0a7d..8ab42e97ef 100644 --- a/examples/widgets/tutorials/modelview/7_selections/7_selections.pro +++ b/examples/widgets/tutorials/modelview/7_selections/7_selections.pro @@ -6,9 +6,7 @@ HEADERS += mainwindow.h # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/7_selections -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 7_selections.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/7_selections -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/modelview/modelview.pro b/examples/widgets/tutorials/modelview/modelview.pro index 2d6460fc4d..b21fe5afdc 100644 --- a/examples/widgets/tutorials/modelview/modelview.pro +++ b/examples/widgets/tutorials/modelview/modelview.pro @@ -9,8 +9,6 @@ SUBDIRS = 1_readonly \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS modelview.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview -INSTALLS += target sources +INSTALLS += target QT += widgets -- cgit v1.2.3