diff options
| author | Bernhard Rosenkraenzer <br@blankpage.ch> | 2010-04-07 14:33:52 (GMT) |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-04-07 14:46:24 (GMT) |
| commit | 493bfea18600c98431c10f6853310c1c0aa6d869 (patch) | |
| tree | 12d662da33c4846cc763725837a859b7f801ef0f /src | |
| parent | 9e7aa36606bf8f407a3d9169e2253c550624f678 (diff) | |
| download | Qt-493bfea18600c98431c10f6853310c1c0aa6d869.zip Qt-493bfea18600c98431c10f6853310c1c0aa6d869.tar.gz Qt-493bfea18600c98431c10f6853310c1c0aa6d869.tar.bz2 | |
Allow building Qt without the QtGui module
This adds a -no-gui switch to configure, allowing to build Qt without
QtGui and components depending on QtGui.
This is useful on headless servers, and in using QtCore, QtNetwork,
QtXml, QtSql etc. on platforms QtGui hasn't been ported to yet.
Task-number: QTBUG-4007
Merge-request: 543
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/plugins.pro | 5 | ||||
| -rw-r--r-- | src/src.pro | 9 | ||||
| -rw-r--r-- | src/tools/tools.pro | 3 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 42fbf9e..507654f 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,15 +1,16 @@ TEMPLATE = subdirs -SUBDIRS *= imageformats sqldrivers iconengines script bearer +SUBDIRS *= sqldrivers script bearer unix:!symbian { contains(QT_CONFIG,iconv)|contains(QT_CONFIG,gnu-libiconv):SUBDIRS *= codecs } else { SUBDIRS *= codecs } +!contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats iconengines !embedded:SUBDIRS *= graphicssystems embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers !win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods -!symbian:SUBDIRS += accessible +!symbian:!contains(QT_CONFIG, no-gui):SUBDIRS += accessible symbian:SUBDIRS += s60 contains(QT_CONFIG, phonon): SUBDIRS *= phonon contains(QT_CONFIG, multimedia): SUBDIRS *= audio mediaservices diff --git a/src/src.pro b/src/src.pro index 6ccd955..ea65e25 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,20 +4,21 @@ TEMPLATE = subdirs unset(SRC_SUBDIRS) win32:SRC_SUBDIRS += src_winmain wince*:{ - SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_testlib + SRC_SUBDIRS += src_corelib src_xml src_sql src_network src_testlib } else:symbian { - SRC_SUBDIRS += src_s60main src_corelib src_xml src_gui src_network src_sql src_testlib + SRC_SUBDIRS += src_s60main src_corelib src_xml src_network src_sql src_testlib !symbian-abld:!symbian-sbsv2 { include(tools/tools.pro) } } else { - SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_testlib + SRC_SUBDIRS += src_corelib src_xml src_network src_sql src_testlib !vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support include(tools/tools.pro) } win32:SRC_SUBDIRS += src_activeqt !symbian:contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus +!contains(QT_CONFIG, no-gui): SRC_SUBDIRS += src_gui contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl contains(QT_CONFIG, openvg): SRC_SUBDIRS += src_openvg contains(QT_CONFIG, xmlpatterns): SRC_SUBDIRS += src_xmlpatterns @@ -28,7 +29,7 @@ contains(QT_CONFIG, webkit) { SRC_SUBDIRS += src_webkit } contains(QT_CONFIG, script): SRC_SUBDIRS += src_script -contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools +!contains(QT_CONFIG, no-gui):contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_declarative contains(QT_CONFIG, multimedia): SRC_SUBDIRS += src_multimedia SRC_SUBDIRS += src_plugins diff --git a/src/tools/tools.pro b/src/tools/tools.pro index cd7cd9b..1ecb944 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -1,6 +1,7 @@ TEMPLATE = subdirs -TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic +TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc +!contains(QT_CONFIG, no-gui): TOOLS_SUBDIRS += src_tools_uic !cross_compile { contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3 win32:!wince*: SRC_SUBDIRS += src_tools_idc |