From cb3d2252eaacf35a5b3c76eaa884ab4b46af74dd Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Mon, 17 May 2010 15:45:56 +0200
Subject: Compile fixes.

---
 .../qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro    | 13 +++++++++++++
 .../qgraphicslayouts/graphicsLayouts/graphicslayouts.pro    | 13 -------------
 examples/graphicsview/padnavigator/padnavigator.h           |  4 ++++
 src/declarative/qml/qdeclarativeengine_p.h                  |  1 +
 4 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro
 delete mode 100644 examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro

diff --git a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro
new file mode 100644
index 0000000..e5d91b2
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro
@@ -0,0 +1,13 @@
+TEMPLATE = app
+TARGET  = graphicslayouts
+QT += declarative
+
+SOURCES += \
+    graphicslayouts.cpp \
+    main.cpp
+
+HEADERS += \
+    graphicslayouts_p.h
+
+RESOURCES += \
+    graphicslayouts.qrc
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro
deleted file mode 100644
index e5d91b2..0000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE = app
-TARGET  = graphicslayouts
-QT += declarative
-
-SOURCES += \
-    graphicslayouts.cpp \
-    main.cpp
-
-HEADERS += \
-    graphicslayouts_p.h
-
-RESOURCES += \
-    graphicslayouts.qrc
diff --git a/examples/graphicsview/padnavigator/padnavigator.h b/examples/graphicsview/padnavigator/padnavigator.h
index 03a1ea2..d9298ae 100644
--- a/examples/graphicsview/padnavigator/padnavigator.h
+++ b/examples/graphicsview/padnavigator/padnavigator.h
@@ -45,10 +45,14 @@
 #include <QGraphicsView>
 #include "ui_form.h"
 
+QT_BEGIN_NAMESPACE
+
 class QState;
 class QStateMachine;
 class Ui_Form;
 
+QT_END_NAMESPACE
+
 //! [0]
 class PadNavigator : public QGraphicsView
 {
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h
index 531ac97..0b1c17d 100644
--- a/src/declarative/qml/qdeclarativeengine_p.h
+++ b/src/declarative/qml/qdeclarativeengine_p.h
@@ -91,6 +91,7 @@ class QDeclarativeEngine;
 class QDeclarativeContextPrivate;
 class QDeclarativeExpression;
 class QDeclarativeContextScriptClass;
+class QDeclarativeImportDatabase;
 class QDeclarativeObjectScriptClass;
 class QDeclarativeTypeNameScriptClass;
 class QDeclarativeValueTypeScriptClass;
-- 
cgit v0.12