diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-03 05:21:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-03 05:21:49 (GMT) |
| commit | ce01f19674923cb5144bb56fe76ecbe19865d3bd (patch) | |
| tree | 2235ab6b1b469ca0232ccf621309e3a90d770e2a /src/plugins/imageformats/imageformats.pro | |
| parent | daeb81493aef4fd8f632ba4ea7f8d12ed80fa7be (diff) | |
| parent | 1358c4b53cf4cec83ea6d9b0f886b99f76c4847e (diff) | |
| download | Qt-ce01f19674923cb5144bb56fe76ecbe19865d3bd.zip Qt-ce01f19674923cb5144bb56fe76ecbe19865d3bd.tar.gz Qt-ce01f19674923cb5144bb56fe76ecbe19865d3bd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Consolidate zlib configuration redundancy
Fixed whitespace formatting
Fix incomplete support for built-in jpeg, mng, tiff and gif handlers
Split image handler plugin project files
No explicit link to zlib/jpeg for system mng/tiff
Removed stray line continuations
Long live else!
qdoc: Added a solution for creating tables of contents for manuals.
Doc: Fixed markup.
Fixed size hint for combo box on windows
Diffstat (limited to 'src/plugins/imageformats/imageformats.pro')
| -rw-r--r-- | src/plugins/imageformats/imageformats.pro | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro index 2e4036b..5fff2de 100644 --- a/src/plugins/imageformats/imageformats.pro +++ b/src/plugins/imageformats/imageformats.pro @@ -1,8 +1,8 @@ TEMPLATE = subdirs -!contains(QT_CONFIG, no-jpeg):SUBDIRS += jpeg -!contains(QT_CONFIG, no-gif):SUBDIRS += gif -!contains(QT_CONFIG, no-mng):SUBDIRS += mng +!contains(QT_CONFIG, no-jpeg):!contains(QT_CONFIG, jpeg):SUBDIRS += jpeg +!contains(QT_CONFIG, no-gif):!contains(QT_CONFIG, gif):SUBDIRS += gif +!contains(QT_CONFIG, no-mng):!contains(QT_CONFIG, mng):SUBDIRS += mng contains(QT_CONFIG, svg):SUBDIRS += svg -!contains(QT_CONFIG, no-tiff):SUBDIRS += tiff +!contains(QT_CONFIG, no-tiff):!contains(QT_CONFIG, tiff):SUBDIRS += tiff !contains(QT_CONFIG, no-ico):SUBDIRS += ico |