Title: [136453] trunk/Source/WebCore
- Revision
- 136453
- Author
- [email protected]
- Date
- 2012-12-03 16:11:16 -0800 (Mon, 03 Dec 2012)
Log Message
[Qt] Unreviewed build fix after r136410
When building without libjpeg, take JPEGImageDecoder's header out, since it now includes libjpeg.h.
* Target.pri: conditionally add JPEGImageDecoder.h to HEADERS
* platform/image-decoders/ImageDecoder.cpp: guard JPEGImageDecoder.h's include
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (136452 => 136453)
--- trunk/Source/WebCore/ChangeLog 2012-12-04 00:04:52 UTC (rev 136452)
+++ trunk/Source/WebCore/ChangeLog 2012-12-04 00:11:16 UTC (rev 136453)
@@ -1,3 +1,12 @@
+2012-12-03 Pierre Rossi <[email protected]>
+
+ [Qt] Unreviewed build fix after r136410
+
+ When building without libjpeg, take JPEGImageDecoder's header out, since it now includes libjpeg.h.
+
+ * Target.pri: conditionally add JPEGImageDecoder.h to HEADERS
+ * platform/image-decoders/ImageDecoder.cpp: guard JPEGImageDecoder.h's include
+
2012-12-03 Kenneth Rohde Christiansen <[email protected]>
[EFL][Qt][WK2] Fixed position elements are not always fixed
Modified: trunk/Source/WebCore/Target.pri (136452 => 136453)
--- trunk/Source/WebCore/Target.pri 2012-12-04 00:04:52 UTC (rev 136452)
+++ trunk/Source/WebCore/Target.pri 2012-12-04 00:11:16 UTC (rev 136453)
@@ -2211,7 +2211,6 @@
platform/image-decoders/ico/ICOImageDecoder.h \
platform/image-decoders/gif/GIFImageDecoder.h \
platform/image-decoders/gif/GIFImageReader.h \
- platform/image-decoders/jpeg/JPEGImageDecoder.h \
platform/image-decoders/png/PNGImageDecoder.h \
platform/KillRing.h \
platform/KURL.h \
@@ -4048,6 +4047,7 @@
}
use?(LIBJPEG) {
+ HEADERS += platform/image-decoders/jpeg/JPEGImageDecoder.h
SOURCES += platform/image-decoders/jpeg/JPEGImageDecoder.cpp
}
Modified: trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp (136452 => 136453)
--- trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp 2012-12-04 00:04:52 UTC (rev 136452)
+++ trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp 2012-12-04 00:11:16 UTC (rev 136453)
@@ -28,7 +28,9 @@
#if PLATFORM(QT)
#include "ImageDecoderQt.h"
#endif
+#if !PLATFORM(QT) || USE(LIBJPEG)
#include "JPEGImageDecoder.h"
+#endif
#include "PNGImageDecoder.h"
#include "PlatformMemoryInstrumentation.h"
#include "SharedBuffer.h"
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
