Fix leak in tst_qquicklistmodel unit test

[profile/ivi/qtdeclarative.git] / qtdeclarative.pro

diff --git a/qtdeclarative.pro b/qtdeclarative.pro
index ccee5fa..2d3d6c7 100644 (file)
--- a/qtdeclarative.pro
+++ b/qtdeclarative.pro
@@ -7,14 +7,7 @@ module_qtdeclarative_tools.subdir = tools
 module_qtdeclarative_tools.target = module-qtdeclarative-tools
 module_qtdeclarative_tools.depends = module_qtdeclarative_src
 
-module_qtdeclarative_demos.subdir = demos
-module_qtdeclarative_demos.target = module-qtdeclarative-demos
-module_qtdeclarative_demos.depends = module_qtdeclarative_src
-!contains(QT_BUILD_PARTS,demos) {
-    module_qtdeclarative_demos.CONFIG = no_default_target no_default_install
-}
-
-module_qtdeclarative_examples.subdir = examples/declarative
+module_qtdeclarative_examples.subdir = examples
 module_qtdeclarative_examples.target = module-qtdeclarative-examples
 module_qtdeclarative_examples.depends = module_qtdeclarative_src
 !contains(QT_BUILD_PARTS,examples) {
@@ -24,11 +17,12 @@ module_qtdeclarative_examples.depends = module_qtdeclarative_src
 module_qtdeclarative_tests.subdir = tests
 module_qtdeclarative_tests.target = module-qtdeclarative-tests
 module_qtdeclarative_tests.depends = module_qtdeclarative_src
-module_qtdeclarative_tests.CONFIG = no_default_target no_default_install
-
+module_qtdeclarative_tests.CONFIG = no_default_install
+!contains(QT_BUILD_PARTS,tests):module_qtdeclarative_tests.CONFIG += no_default_target
 
 SUBDIRS += module_qtdeclarative_src \
            module_qtdeclarative_tools \
-           module_qtdeclarative_demos \
            module_qtdeclarative_examples \
            module_qtdeclarative_tests \
+
+include(doc/config/qtdeclarative_doc.pri)