summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-11-04 06:29:46 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-11-04 06:29:46 (GMT)
commit1400ce5b85fbe7c67899f5f62bfd276eecb21ae0 (patch)
treeccc72723d2305b4d24f9ec296e6d9ee7d3d9d16a /src/gui/image
parent867be3fd7a2017377e8ae5cc3ab789b3b01733bd (diff)
parentbe71186962db5974113e89b0e7c7aa1ab3987379 (diff)
downloadQt-1400ce5b85fbe7c67899f5f62bfd276eecb21ae0.zip
Qt-1400ce5b85fbe7c67899f5f62bfd276eecb21ae0.tar.gz
Qt-1400ce5b85fbe7c67899f5f62bfd276eecb21ae0.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qiconloader.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp
index 234f271..15af7a2 100644
--- a/src/gui/image/qiconloader.cpp
+++ b/src/gui/image/qiconloader.cpp
@@ -61,7 +61,6 @@
#ifdef Q_WS_X11
#include <private/qt_x11_p.h>
-#include <private/gtksymbols_p.h>
#endif
QT_BEGIN_NAMESPACE