From 7f353ae912a935b9837cd5a00de295ec64a220af Mon Sep 17 00:00:00 2001
From: Brad Hards <bradh@kde.org>
Date: Mon, 25 May 2009 21:49:12 +1000
Subject: Remove duplicate qpdf_p.h include.

---
 src/gui/text/qfontengine_ft.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index 6f5ee1f..a93c391 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -54,8 +54,6 @@
 #include <private/qpdf_p.h>
 #include <private/qharfbuzz_p.h>
 
-#include <private/qpdf_p.h>
-
 #include "qfontengine_ft_p.h"
 #include <ft2build.h>
 #include FT_FREETYPE_H
-- 
cgit v0.12


From 4a44a8b4be1ba827ccaee8bf19903c6adb9c0900 Mon Sep 17 00:00:00 2001
From: Brad Hards <bradh@kde.org>
Date: Tue, 26 May 2009 13:38:42 +1000
Subject: Fix build when compiling Qt using -no-opengl configuration.

---
 examples/animation/sub-attaq/mainwindow.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/examples/animation/sub-attaq/mainwindow.cpp b/examples/animation/sub-attaq/mainwindow.cpp
index 9cf9eb5..5e8e259 100644
--- a/examples/animation/sub-attaq/mainwindow.cpp
+++ b/examples/animation/sub-attaq/mainwindow.cpp
@@ -44,9 +44,12 @@
 #include "graphicsscene.h"
 
 //Qt
-#include <QtGui/QtGui>
-#ifndef QT_NO_OPENGL
-#include <QtOpenGL/QtOpenGL>
+#ifdef QT_NO_OPENGL
+    #include <QtGui/QMenuBar>
+    #include <QtGui/QLayout>
+    #include <QtGui/QApplication>
+#else
+    #include <QtOpenGL/QtOpenGL>
 #endif
 
 MainWindow::MainWindow() : QMainWindow(0)
-- 
cgit v0.12