diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-07-03 11:07:41 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-07-03 21:34:51 (GMT) |
| commit | 428cc105630fbec3fa9010cde347d2e1cd35eb49 (patch) | |
| tree | dc28a17df70b71383bd5a1dfef07b3113316316d | |
| parent | ce01f19674923cb5144bb56fe76ecbe19865d3bd (diff) | |
| download | Qt-428cc105630fbec3fa9010cde347d2e1cd35eb49.zip Qt-428cc105630fbec3fa9010cde347d2e1cd35eb49.tar.gz Qt-428cc105630fbec3fa9010cde347d2e1cd35eb49.tar.bz2 | |
Fix Windows build
Set the QT_NO_IMAGEFORMAT_* defines like the unix configure does.
This avoids that we try to link the image handlers into QtGui when
they are built as plugins.
Reviewed-by: ossi
| -rw-r--r-- | tools/configure/configureapp.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index ae1af89..952d4e0 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3033,10 +3033,10 @@ void Configure::generateConfigfiles() if (dictionary["STYLE_GTK"] != "yes") qconfigList += "QT_NO_STYLE_GTK"; if (dictionary["GIF"] == "yes") qconfigList += "QT_BUILTIN_GIF_READER=1"; - if (dictionary["PNG"] == "no") qconfigList += "QT_NO_IMAGEFORMAT_PNG"; - if (dictionary["MNG"] == "no") qconfigList += "QT_NO_IMAGEFORMAT_MNG"; - if (dictionary["JPEG"] == "no") qconfigList += "QT_NO_IMAGEFORMAT_JPEG"; - if (dictionary["TIFF"] == "no") qconfigList += "QT_NO_IMAGEFORMAT_TIFF"; + if (dictionary["PNG"] != "yes") qconfigList += "QT_NO_IMAGEFORMAT_PNG"; + if (dictionary["MNG"] != "yes") qconfigList += "QT_NO_IMAGEFORMAT_MNG"; + if (dictionary["JPEG"] != "yes") qconfigList += "QT_NO_IMAGEFORMAT_JPEG"; + if (dictionary["TIFF"] != "yes") qconfigList += "QT_NO_IMAGEFORMAT_TIFF"; if (dictionary["ZLIB"] == "no") { qconfigList += "QT_NO_ZLIB"; qconfigList += "QT_NO_COMPRESS"; |