From 511265f881fad770d567e571e2d0739b97b8ede1 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Fri, 20 Jan 2012 09:11:18 +1000 Subject: [PATCH] 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 --- doc/doc.pro | 4 +++- qtmultimedia.pro | 6 ++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/doc.pro b/doc/doc.pro index d0e0ed40..314a8739 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 diff --git a/qtmultimedia.pro b/qtmultimedia.pro index 6aa52f10..7d538a04 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)