From af80124876d02151b3465d6cd460171199605665 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Fri, 30 Jul 2010 16:54:18 +0200
Subject: [PATCH] Fix compilation for namespaced Qt.

---
 src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h | 2 +-
 src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h b/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h
index cd231c95dc4..c6343f8956b 100644
--- a/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h
+++ b/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h
@@ -3,7 +3,7 @@
 
 #include <QtGui/QDialog>
 
-class QCheckBox;
+QT_FORWARD_DECLARE_CLASS(QCheckBox);
 
 namespace Qt4ProjectManager {
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h
index 89495a7d117..2cc031861a7 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h
@@ -38,7 +38,9 @@
 #include <QMutex>
 #include <QWaitCondition>
 
+QT_BEGIN_NAMESPACE
 class QSettings;
+QT_END_NAMESPACE
 
 namespace Qt4ProjectManager {
 namespace Internal {
-- 
GitLab