From 80cc17c78b7e812250f7498983ac14d909422325 Mon Sep 17 00:00:00 2001 From: Bernhard Rosenkraenzer Date: Mon, 9 May 2011 11:34:23 +0200 Subject: Fix -no-gui -no-gui still tried to build the graphicssystem and inputmethod plugins, both of which require QtGui Merge-request: 1215 Reviewed-by: Oswald Buddenhagen (cherry picked from commit f0ae4f8ebdc6b7c50c163cfa29e686f3f87c8ba5) Conflicts: src/plugins/plugins.pro Change-Id: I74ced5817989604f3beebf1fcc60eabaf1fd8115 Reviewed-on: http://codereview.qt-project.org/4568 Reviewed-by: Qt Sanity Bot Reviewed-by: Oswald Buddenhagen --- src/plugins/plugins.pro | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/plugins/plugins.pro') diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index c1aff35428..0f2392eeeb 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -6,10 +6,12 @@ unix:!symbian { } else { SUBDIRS *= codecs } -!contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats -!embedded:!qpa:SUBDIRS *= graphicssystems +!contains(QT_CONFIG, no-gui) { + SUBDIRS *= imageformats + !embedded:!qpa:SUBDIRS *= graphicssystems + !win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods + !symbian:SUBDIRS += accessible +} embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers -!win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods -!symbian:!contains(QT_CONFIG, no-gui):SUBDIRS += accessible symbian:SUBDIRS += s60 qpa:SUBDIRS += platforms -- cgit v1.2.3