From a778ee7c030b207c0c4e8d46c2bc05da47d8f68d Mon Sep 17 00:00:00 2001 From: Jouni Hiltunen Date: Wed, 2 Dec 2009 20:54:28 +0100 Subject: Add config checks to auto.pro tests\auto\auto.pro does not check for qt3support or opengl. On symbian this generates errors as the build file generation for the tests is skipped but the tests are still added into bld.inf for the autotests. X:\QT\tests\auto\BLD.INF:250: qgl\bld.inf: No such file or directory Added check for qt3support before adding Q3SUBDIRS and opengl check before adding qgl. External-Reviewed-by: samuelnevala Merge-request: 2104 Reviewed-by: Thiago Macieira --- tests/auto/auto.pro | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index d5d72a7..92d29ae 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -148,7 +148,6 @@ SUBDIRS += \ qfontmetrics \ qftp \ qgetputenv \ - qgl \ qglobal \ qgraphicseffect \ qgraphicseffectsource \ @@ -458,7 +457,9 @@ SUBDIRS += \ rcc \ windowsmobile -!wince*:SUBDIRS += $$Q3SUBDIRS +contains(QT_CONFIG,opengl):SUBDIRS += qgl + +contains(QT_CONFIG,qt3support):!wince*:SUBDIRS += $$Q3SUBDIRS contains(QT_CONFIG, OdfWriter):SUBDIRS += qzip qtextodfwriter mac: { -- cgit v0.12