From af6ad82b04135a485b3efc88d654c8209db70673 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Fri, 13 Nov 2009 16:31:22 +0100
Subject: Some compile fixes.

---
 src/gui/dialogs/qerrormessage.cpp       | 2 +-
 src/gui/painting/qwindowsurface_s60.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/dialogs/qerrormessage.cpp b/src/gui/dialogs/qerrormessage.cpp
index 762936a..a50b2ca 100644
--- a/src/gui/dialogs/qerrormessage.cpp
+++ b/src/gui/dialogs/qerrormessage.cpp
@@ -70,10 +70,10 @@ extern bool qt_wince_is_high_dpi();  //defined in qguifunctions_wince.cpp
 
 #if defined(QT_SOFTKEYS_ENABLED)
 #include <qaction.h>
+#endif
 #ifdef Q_WS_S60
 #include "private/qt_s60_p.h"
 #endif
-#endif
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/painting/qwindowsurface_s60.cpp b/src/gui/painting/qwindowsurface_s60.cpp
index 5244fea..4939d37 100644
--- a/src/gui/painting/qwindowsurface_s60.cpp
+++ b/src/gui/painting/qwindowsurface_s60.cpp
@@ -44,7 +44,7 @@
 #include <QtGui/qpaintdevice.h>
 #include <private/qwidget_p.h>
 #include "qwindowsurface_s60_p.h"
-#include "qpixmap_s60_p.h"
+#include <private/qpixmap_s60_p.h>
 #include <private/qt_s60_p.h>
 #include "private/qdrawhelper_p.h"
 
-- 
cgit v0.12