diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-06-30 18:00:03 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-06-30 18:03:51 (GMT) |
| commit | ec50421c7c592b2365a1f3d4c3dd251b145681e7 (patch) | |
| tree | d5d9f6aa000cdaa80bda49f81bd9b4a64fce6614 /src/gui/image | |
| parent | bed06332190147b4061a563aedcbf103ae155830 (diff) | |
| download | Qt-ec50421c7c592b2365a1f3d4c3dd251b145681e7.zip Qt-ec50421c7c592b2365a1f3d4c3dd251b145681e7.tar.gz Qt-ec50421c7c592b2365a1f3d4c3dd251b145681e7.tar.bz2 | |
Reformat whitespace according to coding style
Mostly indentation affected, but also standardized spaces
adjacent to () in configureapp.cpp.
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/image.pri | 4 | ||||
| -rw-r--r-- | src/gui/image/qimagereader.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index c4eac95..f5f1bc0 100644 --- a/src/gui/image/image.pri +++ b/src/gui/image/image.pri @@ -63,7 +63,7 @@ embedded { } x11 { HEADERS += image/qpixmap_x11_p.h - SOURCES += image/qpixmap_x11.cpp + SOURCES += image/qpixmap_x11.cpp } mac { HEADERS += image/qpixmap_mac_p.h @@ -96,7 +96,7 @@ SOURCES += \ unix|win32-g++*:LIBS_PRIVATE += -lpng win32:!win32-g++*:LIBS += libpng.lib } else { - DEFINES *= QT_USE_BUNDLED_LIBPNG + DEFINES *= QT_USE_BUNDLED_LIBPNG !isEqual(QT_ARCH, i386):!isEqual(QT_ARCH, x86_64):DEFINES += PNG_NO_ASSEMBLER_CODE INCLUDEPATH += ../3rdparty/libpng SOURCES += ../3rdparty/libpng/png.c \ diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp index 93d5cd3..af43e90 100644 --- a/src/gui/image/qimagereader.cpp +++ b/src/gui/image/qimagereader.cpp @@ -301,7 +301,7 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device, if (!handler && !testFormat.isEmpty()) { if (false) { #ifndef QT_NO_IMAGEFORMAT_PNG - } else if (testFormat == "png") { + } else if (testFormat == "png") { handler = new QPngHandler; #endif #ifndef QT_NO_IMAGEFORMAT_BMP |