summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-04-05 12:09:57 (GMT)
committerSamuel Rødal <samuel.rodal@nokia.com>2011-04-05 12:40:42 (GMT)
commit90bc27ebe4dc59c3966ba9b3b18fa209e24afd7d (patch)
tree0e02eb14e3322003c848d6b3091226c27f2cb574 /src/gui/image
parent42c1f472dff49cb972066d3d7a65460894bcd92e (diff)
downloadQt-90bc27ebe4dc59c3966ba9b3b18fa209e24afd7d.zip
Qt-90bc27ebe4dc59c3966ba9b3b18fa209e24afd7d.tar.gz
Qt-90bc27ebe4dc59c3966ba9b3b18fa209e24afd7d.tar.bz2
Fixed compilation of qpixmap_raster.cpp
qfont_p.h indirectly includes qdebug.h, which must be included before any X11 headers (as they define Status). Reviewed-by: Jiang Jiang
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qpixmap_raster.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp
index 4d9709f..0a4d921 100644
--- a/src/gui/image/qpixmap_raster.cpp
+++ b/src/gui/image/qpixmap_raster.cpp
@@ -41,6 +41,8 @@
#include "qpixmap.h"
+#include <private/qfont_p.h>
+
#include "qpixmap_raster_p.h"
#include "qnativeimage_p.h"
#include "qimage_p.h"
@@ -54,7 +56,6 @@
#include <private/qsimd_p.h>
#include <private/qwidget_p.h>
#include <private/qdrawhelper_p.h>
-#include <private/qfont_p.h>
QT_BEGIN_NAMESPACE