diff options
| author | Ulf Hermann <ulf.hermann@digia.com> | 2014-02-17 12:28:57 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-17 14:37:37 +0100 |
| commit | 10ca1b7d2fb60050a348bcb697d444de1e16fb38 (patch) | |
| tree | 2ffc04dd016fcb5f343bfde3b465c402fea33433 | |
| parent | 742a7a0bd18d4ec23288b132a0e190235bff0547 (diff) | |
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>
| -rw-r--r-- | src/quick/util/qquickprofiler_p.h | 7 | ||||
| -rw-r--r-- | 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) |