From 53da069b3294b45db05feca751a6d4569eb8c7ab Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 11 Aug 2020 20:10:48 +0200 Subject: Don't depend on tools for the qtestlib examples Only widgets is required here, so drop the dependency on QT_BUILD_PARTS and just depend on widgets. Pick-to: 5.15 Change-Id: Idaae547b69ffd91681900b33c73e4a341011c30c Reviewed-by: Joerg Bornemann --- examples/qtestlib/CMakeLists.txt | 2 +- examples/qtestlib/qtestlib.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'examples/qtestlib') diff --git a/examples/qtestlib/CMakeLists.txt b/examples/qtestlib/CMakeLists.txt index a98c499c00..a3ffcd2481 100644 --- a/examples/qtestlib/CMakeLists.txt +++ b/examples/qtestlib/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from qtestlib.pro. -if(NOT QT_BUILD_PARTS___contains___tools OR NOT TARGET Qt::Widgets) +if(NOT TARGET Qt::Widgets) return() endif() add_subdirectory(tutorial1) diff --git a/examples/qtestlib/qtestlib.pro b/examples/qtestlib/qtestlib.pro index 4a7663a088..bbebe0a950 100644 --- a/examples/qtestlib/qtestlib.pro +++ b/examples/qtestlib/qtestlib.pro @@ -1,4 +1,4 @@ -requires(contains(QT_BUILD_PARTS,tools):qtHaveModule(widgets)) +requires(qtHaveModule(widgets)) TEMPLATE = subdirs SUBDIRS = tutorial1 tutorial2 tutorial3 tutorial4 tutorial5 -- cgit v1.2.3