Add no_default_install CONFIG and fix target names

Add no_default_install to qmake, and use it for tests
in modules. Add proper target names for subdirs, and
fix up some of the subdir paths. Also add demos to
the qtsvg module's pro file.

7 files changed, 48 insertions, 20 deletions

diff --git a/files/qt3support.pro b/files/qt3support.pro
index 1e05b90..92cbae0 100644
--- a/files/qt3support.pro
+++ b/files/qt3support.pro
@@ -1,13 +1,16 @@
 TEMPLATE = subdirs
 
 module_qt3support_src.subdir = src
+module_qt3support_src.target = module-qt3support-src
 
 module_qt3support_tools.subdir = tools
+module_qt3support_tool.target = module-qt3support-tool
 module_qt3support_tools.depends = module_qt3support_src
 
 module_qt3support_tests.subdir = tests
+module_qt3support_test.target = module-qt3support-test
 module_qt3support_tests.depends = module_qt3support_src
-module_qt3support_tests.CONFIG = no_default_target
+module_qt3support_tests.CONFIG = no_default_target no_default_install
 
 SUBDIRS += module_qt3support_src \
            module_qt3support_tools \
diff --git a/files/qtmultimedia.pro b/files/qtmultimedia.pro
index 129ffb4..bbaaa7a 100644
--- a/files/qtmultimedia.pro
+++ b/files/qtmultimedia.pro
@@ -1,16 +1,20 @@
 TEMPLATE = subdirs
 
 module_qtmultimedia_src.subdir = src
+module_qtmultimedia_src.target = module-qtmultimedia-src
 
 module_qtmultimedia_demos.subdir = demos
+module_qtmultimedia_demos.target = module-qtmultimedia-demos
 module_qtmultimedia_demos.depends = module_qtmultimedia_src
 
 module_qtmultimedia_examples.subdir = examples
+module_qtmultimedia_examples.target = module-qtmultimedia-examples
 module_qtmultimedia_examples.depends = module_qtmultimedia_src
 
 module_qtmultimedia_tests.subdir = tests
+module_qtmultimedia_tests.target = module-qtmultimedia-tests
 module_qtmultimedia_tests.depends = module_qtmultimedia_src
-module_qtmultimedia_tests.CONFIG = no_default_target
+module_qtmultimedia_tests.CONFIG = no_default_target no_default_install
 
 SUBDIRS += module_qtmultimedia_src \
            module_qtmultimedia_demos \
diff --git a/files/qtquick.pro b/files/qtquick.pro
index e25fb05..810ad12 100644
--- a/files/qtquick.pro
+++ b/files/qtquick.pro
@@ -1,21 +1,28 @@
 TEMPLATE = subdirs
 
-module_qtquick_src.subdir = $$IN_PWD/src
+module_qtquick_src.subdir = src
+module_qtquick_src.target = module-qtquick-src
 
-module_qtquick_tools.subdir = $$IN_PWD/tools
+module_qtquick_tools.subdir = tools
+module_qtquick_tools.target = module-qtquick-tools
 module_qtquick_tools.depends = module_qtquick_src
 
-module_qtquick_imports.subdir = $$IN_PWD/imports
+module_qtquick_imports.subdir = imports
+module_qtquick_imports.target = module-qtquick-imports
 module_qtquick_imports.depends = module_qtquick_src
 
-module_qtquick_demos.subdir = $$IN_PWD/demos
+module_qtquick_demos.subdir = demos
+module_qtquick_demos.target = module-qtquick-demos
 module_qtquick_demos.depends = module_qtquick_src
 
-module_qtquick_examples.subdir = $$IN_PWD/examples/declarative
+module_qtquick_examples.subdir = examples/declarative
+module_qtquick_examples.target = module-qtquick-examples
 module_qtquick_examples.depends = module_qtquick_src
 
+module_qtquick_tests.subdir = tests
+module_qtquick_tests.target = module-qtquick-tests
 module_qtquick_tests.depends = module_qtquick_src
-module_qtquick_tests.CONFIG = no_default_target
+module_qtquick_tests.CONFIG = no_default_target no_default_install
 
 
 SUBDIRS += module_qtquick_src \
diff --git a/files/qtscript.pro b/files/qtscript.pro
index a5219c1..f37d1bf 100644
--- a/files/qtscript.pro
+++ b/files/qtscript.pro
@@ -1,13 +1,16 @@
 TEMPLATE = subdirs
 
 module_qtscript_src.subdir = src
+module_qtscript_src.target = module-qtscript-src
 
 module_qtscript_examples.subdir = examples
+module_qtscript_examples.target = module-qtscript-examples
 module_qtscript_examples.depends = module_qtscript_src
 
 module_qtscript_tests.subdir = tests
+module_qtscript_tests.target = module-qtscript-tests
 module_qtscript_tests.depends = module_qtscript_src
-module_qtscript_tests.CONFIG = no_default_target
+module_qtscript_tests.CONFIG = no_default_target no_default_install
 
 SUBDIRS += module_qtscript_src \
            module_qtscript_examples \
diff --git a/files/qtsvg.pro b/files/qtsvg.pro
index 48a1025..19ff9d5 100644
--- a/files/qtsvg.pro
+++ b/files/qtsvg.pro
@@ -1,10 +1,18 @@
 TEMPLATE = subdirs
 
 module_qtsvg_src.subdir = src
+module_qtsvg_src.target = module-qtsvg-src
+
+module_qtsvg_demos.subdir = demos
+module_qtsvg_demos.target = module-qtsvg-demos
+module_qtsvg_demos.depends = module_qtsvg_src
+
 module_qtsvg_tests.subdir = tests
+module_qtsvg_tests.target = module-qtsvg-tests
 module_qtsvg_tests.depends = module_qtsvg_src
-module_qtsvg_tests.CONFIG = no_default_target
+module_qtsvg_tests.CONFIG = no_default_target no_default_install
 
 SUBDIRS += module_qtsvg_src \
+           module_qtsvg_demos \
            module_qtsvg_tests \
 
diff --git a/files/qttools.pro b/files/qttools.pro
index beac839..871d8cc 100644
--- a/files/qttools.pro
+++ b/files/qttools.pro
@@ -1,9 +1,12 @@
 TEMPLATE = subdirs
 
 module_qttools_src.subdir = src
+module_qttools_src.target = module-qttools-src
+
 module_qttools_tests.subdir = tests
+module_qttools_tests.target = module-qttools-tests
 module_qttools_tests.depends = module_qttools_src
-module_qttools_tests.CONFIG = no_default_target
+module_qttools_tests.CONFIG = no_default_target no_default_install
 
 SUBDIRS += module_qttools_src \
            module_qttools_tests \
diff --git a/files/qtxmlpatterns.pro b/files/qtxmlpatterns.pro
index f1897cd..6fe9b06 100644
--- a/files/qtxmlpatterns.pro
+++ b/files/qtxmlpatterns.pro
@@ -1,20 +1,20 @@
 TEMPLATE = subdirs
 
-module_qtxmlpatterns_src.subdir = $$IN_PWD/src
-module_qtxmlpatterns_src.target = module-qtkernel-src
+module_qtxmlpatterns_src.subdir = src
+module_qtxmlpatterns_src.target = module-qtxmlpatterns-src
 
-module_qtxmlpatterns_tools.subdir = $$IN_PWD/tools
-module_qtxmlpatterns_tools.target = module-qtkernel-tools
+module_qtxmlpatterns_tools.subdir = tools
+module_qtxmlpatterns_tools.target = module-qtxmlpatterns-tools
 module_qtxmlpatterns_tools.depends = module_qtxmlpatterns_src
 
-module_qtxmlpatterns_examples.subdir = $$IN_PWD/examples/xmlpatterns
-module_qtxmlpatterns_examples.target = module-qtkernel-examples
+module_qtxmlpatterns_examples.subdir = examples/xmlpatterns
+module_qtxmlpatterns_examples.target = module-qtxmlpatterns-examples
 module_qtxmlpatterns_examples.depends = module_qtxmlpatterns_src
 
-module_qtxmlpatterns_tests.subdir = $$IN_PWD/tests
-module_qtxmlpatterns_tests.target = module-qtkernel-tests
+module_qtxmlpatterns_tests.subdir = tests
+module_qtxmlpatterns_tests.target = module-qtxmlpatterns-tests
 module_qtxmlpatterns_tests.depends = module_qtxmlpatterns_src
-module_qtxmlpatterns_tests.CONFIG = no_default_target
+module_qtxmlpatterns_tests.CONFIG = no_default_target no_default_install
 
 SUBDIRS += module_qtxmlpatterns_src \
            module_qtxmlpatterns_tools \