Changeset 561 for trunk/src/gui/image/image.pri

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/image/image.pri (modified) (5 diffs)

trunk/src/gui/image/image.pri

@@ -7 +7 @@
         image/qbitmap.h \
         image/qicon.h \
+
+
         image/qiconengine.h \
         image/qiconengineplugin.h \
@@ -23 +25 @@
         image/qpixmap_raster_p.h \
         image/qpixmapcache.h \
+
         image/qpixmapdata_p.h \
         image/qpixmapdatafactory_p.h \
-        image/qpixmapfilter_p.h
+        image/qpixmapfilter_p.h \
+        image/qimagepixmapcleanuphooks_p.h \
+
 
 SOURCES += \
         image/qbitmap.cpp \
         image/qicon.cpp \
+
         image/qimage.cpp \
         image/qimageiohandler.cpp \
@@ -47 +53 @@
         image/qpixmap_raster.cpp \
         image/qnativeimage.cpp \
+
+
 
 win32 {
@@ -64 +72 @@
     HEADERS += image/qpixmap_mac_p.h
     SOURCES += image/qpixmap_mac.cpp
+
+
+
+
 }
 
@@ -85 +97 @@
 
     contains(QT_CONFIG, system-png) {
-        unix:LIBS  += -lpng
+        unix:LIBS  += -lpng
         win32:LIBS += libpng.lib
     } else {