diff options
| -rw-r--r-- | qtfeedback.pro | 14 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 15 |
2 files changed, 15 insertions, 14 deletions
diff --git a/qtfeedback.pro b/qtfeedback.pro index 498ce1e..407d955 100644 --- a/qtfeedback.pro +++ b/qtfeedback.pro @@ -4,12 +4,12 @@ CONFIG += ordered module_qtfeedback_src.subdir = src module_qtfeedback_src.target = module-qtfeedback-src -#module_qtfeedback_tests.subdir = tests -#module_qtfeedback_tests.target = module-qtfeedback-tests -#module_qtfeedback_tests.depends = module_qtfeedback_src -#!contains(QT_BUILD_PARTS,tests) { -# module_qtfeedback_tests.CONFIG = no_default_target no_default_install -#} +module_qtfeedback_tests.subdir = tests +module_qtfeedback_tests.target = module-qtfeedback-tests +module_qtfeedback_tests.depends = module_qtfeedback_src +!contains(QT_BUILD_PARTS,tests) { + module_qtfeedback_tests.CONFIG = no_default_target no_default_install +} SUBDIRS += module_qtfeedback_src \ -# module_qtfeedback_tests + module_qtfeedback_tests diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index da1c2ae..02226db 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,13 +1,14 @@ TEMPLATE = subdirs -SUBDIRS += qfeedbackactuator \ - qfeedbackhapticseffect \ - qfeedbackplugin \ - qfeedbacknoplugins +#SUBDIRS += qfeedbackactuator \ +# qfeedbackhapticseffect \ +# qfeedbackplugin \ +# qfeedbacknoplugins +SUBDIRS += qfeedbackplugin # this is the same condition that enables the mmk plugin equals(QT_MAJOR_VERSION, 4) : greaterThan(QT_MINOR_VERSION, 6):contains(mobility_modules,multimedia): SUBDIRS += qfeedbackmmk -contains(QT_CONFIG, declarative) { - SUBDIRS += qdeclarativefeedback -} +#contains(QT_CONFIG, declarative) { +# SUBDIRS += qdeclarativefeedback +#} |