diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-01-20 09:11:18 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-20 01:06:56 +0100 |
| commit | 511265f881fad770d567e571e2d0739b97b8ede1 (patch) | |
| tree | 0af1806405f4baaf0929867f1f30c80e61b948a5 /qtmultimedia.pro | |
| parent | f050d8fe2ba6b23654e7df6d51e052ec588b00a3 (diff) | |
| download | qtmultimedia-511265f881fad770d567e571e2d0739b97b8ede1.tar.gz | |
Fixed unreliable enabling of doc snippets
Testing for QT.widgets.name in qtmultimedia.pro causes the behavior of
that .pro file to depend on whether or not qtbase.pro has been
processed. Due to QTBUG-23376, and because these are sibling .pro
files, this is not safe - nothing guarantees that qtmultimedia.pro is
processed after qtbase.pro.
Work around the issue by pushing the QT.widgets.name test down one
level.
Change-Id: I3e155b3f18ad5fa8c527cf5a806313db4b6aabeb
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'qtmultimedia.pro')
| -rw-r--r-- | qtmultimedia.pro | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/qtmultimedia.pro b/qtmultimedia.pro index 6aa52f103..7d538a048 100644 --- a/qtmultimedia.pro +++ b/qtmultimedia.pro @@ -23,10 +23,8 @@ module_qtmultimedia_docsnippets.CONFIG = no_default_install SUBDIRS += module_qtmultimedia_src \ module_qtmultimedia_examples \ - module_qtmultimedia_tests - -# Doc snippets use widgets -!isEmpty(QT.widgets.name): SUBDIRS += module_qtmultimedia_docsnippets + module_qtmultimedia_tests \ + module_qtmultimedia_docsnippets # for make docs: include(doc/config/qtmultimedia_doc.pri) |