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 /doc | |
| parent | f050d8fe2ba6b23654e7df6d51e052ec588b00a3 (diff) | |
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 'doc')
| -rw-r--r-- | doc/doc.pro | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/doc.pro b/doc/doc.pro index d0e0ed409..314a87398 100644 --- a/doc/doc.pro +++ b/doc/doc.pro @@ -5,4 +5,6 @@ ###################################################################### TEMPLATE = subdirs -SUBDIRS += src/snippets + +# Doc snippets use widgets +!isEmpty(QT.widgets.name): SUBDIRS += src/snippets |