~oif-team/ubuntu/natty/qt4-x11/xi2.1

« back to all changes in this revision

Viewing changes to src/gui/image/image.pri

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2009-11-02 18:30:08 UTC
  • mfrom: (1.2.2 upstream)
  • mto: (15.2.5 experimental)
  • mto: This revision was merged to the branch mainline in revision 88.
  • Revision ID: james.westby@ubuntu.com-20091102183008-b6a4gcs128mvfb3m
Tags: upstream-4.6.0~beta1
ImportĀ upstreamĀ versionĀ 4.6.0~beta1

Show diffs side-by-side

added added

removed removed

Lines of Context:
6
6
HEADERS += \
7
7
        image/qbitmap.h \
8
8
        image/qicon.h \
 
9
        image/qicon_p.h \
 
10
        image/qiconloader_p.h \
9
11
        image/qiconengine.h \
10
12
        image/qiconengineplugin.h \
11
13
        image/qimage.h \
22
24
        image/qpixmap.h \
23
25
        image/qpixmap_raster_p.h \
24
26
        image/qpixmapcache.h \
 
27
        image/qpixmapcache_p.h \
25
28
        image/qpixmapdata_p.h \
26
29
        image/qpixmapdatafactory_p.h \
27
 
        image/qpixmapfilter_p.h
 
30
        image/qpixmapfilter_p.h \
 
31
        image/qimagepixmapcleanuphooks_p.h \
 
32
 
28
33
 
29
34
SOURCES += \
30
35
        image/qbitmap.cpp \
31
36
        image/qicon.cpp \
 
37
        image/qiconloader.cpp \
32
38
        image/qimage.cpp \
33
39
        image/qimageiohandler.cpp \
34
40
        image/qimagereader.cpp \
46
52
        image/qmovie.cpp \
47
53
        image/qpixmap_raster.cpp \
48
54
        image/qnativeimage.cpp \
 
55
        image/qimagepixmapcleanuphooks.cpp \
 
56
 
49
57
 
50
58
win32 {
51
59
    SOURCES += image/qpixmap_win.cpp
61
69
    HEADERS += image/qpixmap_mac_p.h
62
70
    SOURCES += image/qpixmap_mac.cpp
63
71
}
 
72
symbian {
 
73
    HEADERS += image/qpixmap_s60_p.h
 
74
    SOURCES += image/qpixmap_s60.cpp
 
75
}
64
76
 
65
77
# Built-in image format support
66
78
HEADERS += \
81
93
    SOURCES += image/qpnghandler.cpp
82
94
 
83
95
    contains(QT_CONFIG, system-png) {
84
 
        unix:LIBS  += -lpng
 
96
        unix:LIBS_PRIVATE  += -lpng
85
97
        win32:LIBS += libpng.lib
86
98
    } else {
87
99
        !isEqual(QT_ARCH, i386):!isEqual(QT_ARCH, x86_64):DEFINES += PNG_NO_ASSEMBLER_CODE