diff options
| author | Bernhard Rosenkraenzer <bero@arklinux.ch> | 2011-05-09 11:34:23 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-12 16:03:47 +0200 |
| commit | 80cc17c78b7e812250f7498983ac14d909422325 (patch) | |
| tree | d55c2395a90c0dd8087bc9bac7bb4fa27eb4eea8 /src | |
| parent | cbe824da6c67d3ef681dc2031fcc0073e88d985d (diff) | |
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 <oswald.buddenhagen@nokia.com>
(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 <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/plugins.pro | 10 |
1 files changed, 6 insertions, 4 deletions
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 |