diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-22 11:46:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-22 11:46:44 (GMT) |
| commit | f1293735a4e828ec08931a2aa85ba96405ac3f76 (patch) | |
| tree | 2b1a1c2e3eeb36fe4dfb549585e67039fa5b2db5 /src/3rdparty/libpng | |
| parent | 69b1784edb6dd82f26100d0e539bfa8a65bdd35d (diff) | |
| parent | fae5e14b5ac5fed5922e5193d0f40c29bd1e0289 (diff) | |
| download | Qt-f1293735a4e828ec08931a2aa85ba96405ac3f76.zip Qt-f1293735a4e828ec08931a2aa85ba96405ac3f76.tar.gz Qt-f1293735a4e828ec08931a2aa85ba96405ac3f76.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Compilation fix for AIX
Fix build on Mac OS X
Fix compilation
Fix compilation on Windows
Copy useBackendOptimization setting when QStaticText is detached
Compilation on symbian
Enable QT_USE_FAST_CONCATENATION by default for compiling Qt
Compile with QT_USE_FAST_OPERATOR_PLUS
QStringBuilder: Do not resize if not required.
QStringBuilder: reduce the size of the generated code
Diffstat (limited to 'src/3rdparty/libpng')
| -rw-r--r-- | src/3rdparty/libpng/png.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/libpng/png.h b/src/3rdparty/libpng/png.h index 14e3416..5ea2b0d 100644 --- a/src/3rdparty/libpng/png.h +++ b/src/3rdparty/libpng/png.h @@ -386,7 +386,7 @@ #include "zlib.h" #endif -#ifdef AIX +#ifdef _AIX #define jmpbuf __jmpbuf #endif |