From e72c0afcfb35de5225a6b4a7fb04c546baa93b07 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 19 Oct 2011 09:08:53 +0200 Subject: QtTools: Remove symbian branches from .pro-files. Change-Id: I9b84010a5e0628e348569201503ab6c25a3bbfd5 Reviewed-by: Friedemann Kleint --- src/src.pro | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'src/src.pro') diff --git a/src/src.pro b/src/src.pro index 8b6a706bb..c335d5076 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,26 +4,20 @@ TEMPLATE = subdirs no-png { message("Some graphics-related tools are unavailable without PNG support") } else { - symbian { - SUBDIRS = designer - } else:wince* { - SUBDIRS = qtestlib designer + SUBDIRS = assistant \ + pixeltool \ + qtestlib \ + qttracereplay + contains(QT_EDITION, Console) { + SUBDIRS += designer/src/uitools # Linguist depends on this } else { - SUBDIRS = assistant \ - pixeltool \ - qtestlib \ - qttracereplay - contains(QT_EDITION, Console) { - SUBDIRS += designer/src/uitools # Linguist depends on this - } else { - SUBDIRS += designer - } + SUBDIRS += designer } -# unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig +# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig } } -!wince*:!symbian:SUBDIRS += linguist +SUBDIRS += linguist mac { SUBDIRS += macdeployqt @@ -38,6 +32,6 @@ embedded: SUBDIRS += makeqpf CONFIG+=ordered QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)" -!win32:!embedded:!mac:!symbian:CONFIG += x11 +!win32:!embedded:!mac:CONFIG += x11 x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += qmeegographicssystemhelper -- cgit v1.2.1