From 10ca1b7d2fb60050a348bcb697d444de1e16fb38 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@digia.com>
Date: Mon, 17 Feb 2014 12:28:57 +0100
Subject: Properly export QQuickProfiler

We want to access the profiler from quickwidgets as well as from quick
itself. Also, use better syntax for includes in qquickprofiler_p.h

Change-Id: Ifee04bae84521e8f028e7e2d272824449338b88a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
---
 src/quick/util/qquickprofiler_p.h | 7 ++++---
 src/quickwidgets/qquickwidget.cpp | 4 ----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/quick/util/qquickprofiler_p.h b/src/quick/util/qquickprofiler_p.h
index d5ad0e9285..721560b9e5 100644
--- a/src/quick/util/qquickprofiler_p.h
+++ b/src/quick/util/qquickprofiler_p.h
@@ -53,8 +53,9 @@
 // We mean it.
 //
 
-#include "private/qqmlabstractprofileradapter_p.h"
-#include <private/qabstractanimation_p.h>
+#include <private/qtquickglobal_p.h>
+#include <QtCore/private/qabstractanimation_p.h>
+#include <QtQml/private/qqmlabstractprofileradapter_p.h>
 #include <QUrl>
 #include <QSize>
 #include <QMutex>
@@ -139,7 +140,7 @@ struct Q_AUTOTEST_EXPORT QQuickProfilerData
 
 Q_DECLARE_TYPEINFO(QQuickProfilerData, Q_MOVABLE_TYPE);
 
-class QQuickProfiler : public QQmlAbstractProfilerAdapter {
+class Q_QUICK_PRIVATE_EXPORT QQuickProfiler : public QQmlAbstractProfilerAdapter {
     Q_OBJECT
 public:
 
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp
index 0b1b101a88..da95e03e5f 100644
--- a/src/quickwidgets/qquickwidget.cpp
+++ b/src/quickwidgets/qquickwidget.cpp
@@ -57,10 +57,6 @@
 
 QT_BEGIN_NAMESPACE
 
-//### profiler is broken: it no longer exports symbols
-#undef Q_QUICK_PROFILE
-#define Q_QUICK_PROFILE(x)
-
 extern Q_GUI_EXPORT QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_format, bool include_alpha);
 
 void QQuickWidgetPrivate::init(QQmlEngine* e)
-- 
cgit v1.2.3