diff options
Diffstat (limited to 'src/gui/image/image.pri')
-rw-r--r-- | src/gui/image/image.pri | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index 8db944e5e3..3c4d2c0bbf 100644 --- a/src/gui/image/image.pri +++ b/src/gui/image/image.pri @@ -11,7 +11,6 @@ HEADERS += \ image/qimagereader.h \ image/qimagewriter.h \ image/qmovie.h \ - image/qnativeimage_p.h \ image/qpaintengine_pic_p.h \ image/qpicture.h \ image/qpicture_p.h \ @@ -45,7 +44,6 @@ SOURCES += \ image/qmovie.cpp \ image/qpixmap_raster.cpp \ image/qpixmap_blitter.cpp \ - image/qnativeimage.cpp \ image/qimagepixmapcleanuphooks.cpp \ image/qicon.cpp \ image/qiconloader.cpp \ @@ -55,6 +53,8 @@ SOURCES += \ win32:!winrt: SOURCES += image/qpixmap_win.cpp +darwin: OBJECTIVE_SOURCES += image/qimage_darwin.mm + NO_PCH_SOURCES += image/qimage_compat.cpp false: SOURCES += $$NO_PCH_SOURCES # Hack for QtCreator @@ -71,11 +71,11 @@ SOURCES += \ image/qxbmhandler.cpp \ image/qxpmhandler.cpp -!contains(QT_CONFIG, no-png):include($$PWD/qpnghandler.pri) -else:DEFINES *= QT_NO_IMAGEFORMAT_PNG - -contains(QT_CONFIG, jpeg):include($$PWD/qjpeghandler.pri) -contains(QT_CONFIG, gif):include($$PWD/qgifhandler.pri) +qtConfig(png) { + HEADERS += image/qpnghandler_p.h + SOURCES += image/qpnghandler.cpp + include($$PWD/../../3rdparty/png_dependency.pri) +} # SIMD SSE2_SOURCES += image/qimage_sse2.cpp |