From 5ba3309703bccc745c1c56ab8fe28529285aaca4 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 24 Jul 2015 13:18:29 +0200 Subject: fix build with no built-in image handlers the handlers' .pri files added $$PWD to INCLUDEPATH to make the files self-contained when used externally, but this polluted the include path of the gui module itself, thus hiding incorrect use of QPA includes. Task-number: QTBUG-47400 Change-Id: I576469a71e8ded0b409d62687999c0fa884613f9 Reviewed-by: Joerg Bornemann --- src/plugins/imageformats/gif/gif.pro | 1 + src/plugins/imageformats/jpeg/jpeg.pro | 1 + 2 files changed, 2 insertions(+) (limited to 'src/plugins/imageformats') diff --git a/src/plugins/imageformats/gif/gif.pro b/src/plugins/imageformats/gif/gif.pro index 898f06e7c7..2a5048bb1c 100644 --- a/src/plugins/imageformats/gif/gif.pro +++ b/src/plugins/imageformats/gif/gif.pro @@ -5,6 +5,7 @@ PLUGIN_CLASS_NAME = QGifPlugin load(qt_plugin) include(../../../gui/image/qgifhandler.pri) +INCLUDEPATH += ../../../gui/image SOURCES += $$PWD/main.cpp HEADERS += $$PWD/main.h OTHER_FILES += gif.json diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro index 45bf7bbd43..e33fde1cdb 100644 --- a/src/plugins/imageformats/jpeg/jpeg.pro +++ b/src/plugins/imageformats/jpeg/jpeg.pro @@ -9,6 +9,7 @@ QT += core-private QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-jpeg)" include(../../../gui/image/qjpeghandler.pri) +INCLUDEPATH += ../../../gui/image SOURCES += main.cpp HEADERS += main.h OTHER_FILES += jpeg.json -- cgit v1.2.3