diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-25 08:51:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-25 08:51:52 (GMT) |
| commit | df2e8fbe96fab8e034ab897b8a767b4a473b34ad (patch) | |
| tree | 578716637feeaeffaca8908c62a7c350aeef8e22 /src/3rdparty/libpng/pnginfo.h | |
| parent | 71bc8dc21687f1b15fc75a789f91753ace771b84 (diff) | |
| parent | 02e2ff4597a7fe81ecbb4b1ef3c5e4a5ac6b7339 (diff) | |
| download | Qt-df2e8fbe96fab8e034ab897b8a767b4a473b34ad.zip Qt-df2e8fbe96fab8e034ab897b8a767b4a473b34ad.tar.gz Qt-df2e8fbe96fab8e034ab897b8a767b4a473b34ad.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (120 commits)
Spelling fix
Fixed lost flushes in raster window surface.
Fix compilation of qjpeg on MinGW with GCC 4.6
uikit: Use correct pixmap data format.
Correctly position aliased lines with flat caps
Make the DBus timeout configurable in QDBusAbstractInterface.
Fix non-ascii name issues in ICD.
Compile fix for Symbian 5th and earlier
Improve documentation for QDeclarativeView::setSource()
fix copying webkit guide under windows
Add a QApplication::queryKeyboardModifiers() method.
Symbian: Fix backspace on empty lines of multiline textedits
Handle CloseSoftwareInputPanel event in QCoeFepInputContext
uikit: Fixes for Open GL ES 1 and for pre-3GS devices
uikit: Fix warning.
Use thumb instructions for uikit
Fix compilation with thumb2.
Update uikit README: svg works, warn about thumb
Fix delayed password masking mid-string.
Disabled splitscreen translation still moves screen
...
Diffstat (limited to 'src/3rdparty/libpng/pnginfo.h')
| -rw-r--r-- | src/3rdparty/libpng/pnginfo.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/3rdparty/libpng/pnginfo.h b/src/3rdparty/libpng/pnginfo.h index fa19f85..a33bfab 100644 --- a/src/3rdparty/libpng/pnginfo.h +++ b/src/3rdparty/libpng/pnginfo.h @@ -138,7 +138,6 @@ defined(PNG_READ_BACKGROUND_SUPPORTED) * single color specified that should be treated as fully transparent. * Data is valid if (valid & PNG_INFO_tRNS) is non-zero. */ - png_bytep trans; /* alpha values for paletted image */ png_bytep trans_alpha; /* alpha values for paletted image */ png_color_16 trans_color; /* transparent color for non-palette image */ #endif |