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>

diff --git a/doc/doc.pro b/doc/doc.pro
index d0e0ed4092a8ee067129f4d2ddf5470c3dc77e4c..314a87398c38bf791ac35fad74e9be895f07898f 100644 (file)
--- 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

diff --git a/qtmultimedia.pro b/qtmultimedia.pro
index 6aa52f1030c9dc94a077bdca2613da9bced513bf..7d538a048191532fc3ea5dfb3b2dca6bbe16edb8 100644 (file)
--- 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)