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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/linguist/linguist.pro | 3 | ||||
| -rw-r--r-- | tools/qdbus/qdbus.pro | 3 | ||||
| -rw-r--r-- | tools/tools.pro | 40 |
3 files changed, 26 insertions, 20 deletions
diff --git a/tools/linguist/linguist.pro b/tools/linguist/linguist.pro index 85ecd5a..c4b7c29 100644 --- a/tools/linguist/linguist.pro +++ b/tools/linguist/linguist.pro @@ -1,6 +1,7 @@ TEMPLATE = subdirs SUBDIRS = \ - linguist \ lrelease \ lupdate \ lconvert +!no-png:!contains(QT_CONFIG, no-gui):SUBDIRS += linguist +CONFIG += ordered diff --git a/tools/qdbus/qdbus.pro b/tools/qdbus/qdbus.pro index 01cd246..a264882 100644 --- a/tools/qdbus/qdbus.pro +++ b/tools/qdbus/qdbus.pro @@ -1,2 +1,3 @@ TEMPLATE = subdirs -SUBDIRS = qdbus qdbusxml2cpp qdbuscpp2xml qdbusviewer +SUBDIRS = qdbus qdbusxml2cpp qdbuscpp2xml +!contains(QT_CONFIG, no-gui): SUBDIRS += qdbusviewer diff --git a/tools/tools.pro b/tools/tools.pro index 3ed07b1..cfa202e 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,25 +1,29 @@ TEMPLATE = subdirs -no-png { - message("Some graphics-related tools are unavailable without PNG support") -} else { - SUBDIRS += assistant \ - pixeltool \ - porting \ - qtestlib \ - qttracereplay - contains(QT_EDITION, Console) { - SUBDIRS += designer/src/uitools # Linguist depends on this - } else { - SUBDIRS += designer - } - SUBDIRS += linguist - symbian: SUBDIRS = designer - wince*: SUBDIRS = qtestlib designer - unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig - win32:!wince*:SUBDIRS += activeqt +!contains(QT_CONFIG, no-gui) { + no-png { + message("Some graphics-related tools are unavailable without PNG support") + } else { + SUBDIRS += assistant \ + pixeltool \ + porting \ + qtestlib \ + qttracereplay + contains(QT_EDITION, Console) { + SUBDIRS += designer/src/uitools # Linguist depends on this + } else { + SUBDIRS += designer + } + symbian: SUBDIRS = designer + wince*: SUBDIRS = qtestlib designer + unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig + win32:!wince*:SUBDIRS += activeqt + } + contains(QT_CONFIG, declarative):SUBDIRS += qmlviewer qmldebugger } +SUBDIRS += linguist + mac { SUBDIRS += macdeployqt } |