From 8fac439e86636a04fa19c7c0dc79e8b95bd74c15 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 24 Mar 2011 13:02:57 +0100
Subject: [PATCH] compile fixes on *nix

---
 .../qmlprofiler/canvas/qdeclarativecontext2d_p.h       | 10 ++--------
 src/plugins/qmlprofiler/qmlprofilerengine.cpp          |  4 ++++
 src/plugins/qmlprofiler/tracewindow.h                  |  2 ++
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h b/src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
index 11555c21abe..6b7d605f6f0 100644
--- a/src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
+++ b/src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
@@ -52,8 +52,6 @@
 #include <QtCore/qvariant.h>
 #include <QtScript/qscriptvalue.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
@@ -74,9 +72,6 @@ public:
     QGradient m_gradient;
 };
 
-Q_DECLARE_METATYPE(CanvasGradient*)
-
-
 class CanvasImage: public QObject
 {
     Q_OBJECT
@@ -103,8 +98,6 @@ private:
     QString m_src;
 };
 
-Q_DECLARE_METATYPE(CanvasImage*)
-
 
 class ImageData {
 };
@@ -337,6 +330,7 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
+Q_DECLARE_METATYPE(CanvasImage*)
+Q_DECLARE_METATYPE(CanvasGradient*)
 
 #endif // QDECLARATIVECONTEXT2D_P_H
diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.cpp b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
index 575e7b0e63f..283a1d1a1de 100644
--- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
@@ -20,6 +20,10 @@
 #include <QProcess>
 #include "tracewindow.h"
 
+#ifdef Q_OS_UNIX
+#include <unistd.h> // sleep
+#endif
+
 using namespace Analyzer::Internal;
 
 class QmlProfilerEngine::QmlProfilerEnginePrivate
diff --git a/src/plugins/qmlprofiler/tracewindow.h b/src/plugins/qmlprofiler/tracewindow.h
index 813be6a7381..558b2bef87e 100644
--- a/src/plugins/qmlprofiler/tracewindow.h
+++ b/src/plugins/qmlprofiler/tracewindow.h
@@ -34,6 +34,7 @@
 #include <QtCore/qpointer.h>
 #include <QtGui/qwidget.h>
 
+QT_BEGIN_NAMESPACE
 class QTabWidget;
 class QSlider;
 class QGroupBox;
@@ -41,6 +42,7 @@ class QLabel;
 class QSpinBox;
 class QPushButton;
 class QDeclarativeView;
+QT_END_NAMESPACE
 
 class TracePlugin;