diff options
| -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) |