diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-13 07:24:47 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-13 08:27:51 (GMT) |
| commit | 13cbcc0ddca0fdd5be9ede09052d31785c1e4d55 (patch) | |
| tree | b647be5699145ccae1545096aba5c495d96f8eb5 /src/gui/image/image.pri | |
| parent | 081078137a6fbc85d6be1437f6afc1d60e4f75f9 (diff) | |
| parent | de088b5a7f7b57e568399334667b14bfc9e7b893 (diff) | |
| download | Qt-13cbcc0ddca0fdd5be9ede09052d31785c1e4d55.zip Qt-13cbcc0ddca0fdd5be9ede09052d31785c1e4d55.tar.gz Qt-13cbcc0ddca0fdd5be9ede09052d31785c1e4d55.tar.bz2 | |
Merge commit 'qt/master'
Conflicts:
examples/opengl/samplebuffers/glwidget.cpp
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/kernel/qobject.cpp
src/corelib/tools/qsharedpointer.cpp
src/gui/gui.pro
tests/auto/qhttp/tst_qhttp.cpp
tests/auto/qkeyevent/tst_qkeyevent.cpp
Diffstat (limited to 'src/gui/image/image.pri')
| -rw-r--r-- | src/gui/image/image.pri | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index 5e9bf8e..1010f7f 100644 --- a/src/gui/image/image.pri +++ b/src/gui/image/image.pri @@ -6,6 +6,8 @@ HEADERS += \ image/qbitmap.h \ image/qicon.h \ + image/qicon_p.h \ + image/qiconloader_p.h \ image/qiconengine.h \ image/qiconengineplugin.h \ image/qimage.h \ @@ -32,6 +34,7 @@ HEADERS += \ SOURCES += \ image/qbitmap.cpp \ image/qicon.cpp \ + image/qiconloader.cpp \ image/qimage.cpp \ image/qimageiohandler.cpp \ image/qimagereader.cpp \ |