slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed unreliable enabling of doc snippets

Browse Source 
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>
This commit is contained in:
Rohan McGovern
2012-01-20 09:11:18 +10:00
committed by Qt by Nokia
parent f050d8fe2b
commit 511265f881
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/doc.pro
View File

@@ -5,4 +5,6 @@
######################################################################
TEMPLATE = subdirs
SUBDIRS += src/snippets
# Doc snippets use widgets
!isEmpty(QT.widgets.name): SUBDIRS += src/snippets

6
qtmultimedia.pro
View File

@@ -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)