AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix -no-gui

Browse Source 
-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>
This commit is contained in:
Bernhard Rosenkraenzer 2011-05-09 11:34:23 +02:00 committed by Qt by Nokia
parent cbe824da6c
commit 80cc17c78b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/plugins.pro
View File

@ -6,10 +6,12 @@ unix:!symbian {
} else { } else {
SUBDIRS *= codecs SUBDIRS *= codecs
} }
!contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats !contains(QT_CONFIG, no-gui) {
!embedded:!qpa:SUBDIRS *= graphicssystems SUBDIRS *= imageformats
!embedded:!qpa:SUBDIRS *= graphicssystems
!win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods
!symbian:SUBDIRS += accessible
}
embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers
!win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods
!symbian:!contains(QT_CONFIG, no-gui):SUBDIRS += accessible
symbian:SUBDIRS += s60 symbian:SUBDIRS += s60
qpa:SUBDIRS += platforms qpa:SUBDIRS += platforms