diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-06-03 15:28:51 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-06-04 17:02:55 +0200 |
| commit | 11a11d1280b1634628b9c4a92a0fc420ee8a3a81 (patch) | |
| tree | b48d9608ef3f08123cdeea605068342131b32b44 /src/quick/items/qquickwindow.h | |
| parent | 52e07d564b65ed6ce26955a676c7692ad67686c1 (diff) | |
| parent | fea26bb2941c3f24c4a5f3ad5efc1b85e0123ff3 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
The merge conflict is about the removal of "d1" from the register
set on ARM, but that was already done in dev in commit ddb33ee9ba9e1344caa9be5dbf4b534c3ede692e
The change in src/quick/scenegraph/coreapi/qsgrenderer.cpp with commit 2414f1675eab163b22dcc4e8ded80ed04d06369b
was reverted to what it was before, per Laszlo's advice.
Conflicts:
src/qml/jit/qv4isel_masm.cpp
Change-Id: I7bce546c5cdee01e37853a476d82279d4e72948b
Diffstat (limited to 'src/quick/items/qquickwindow.h')
| -rw-r--r-- | src/quick/items/qquickwindow.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h index 1a4adb0785..c95ec5b46d 100644 --- a/src/quick/items/qquickwindow.h +++ b/src/quick/items/qquickwindow.h @@ -199,7 +199,7 @@ private Q_SLOTS: private: friend class QQuickItem; friend class QQuickWidget; - friend class QQuickWidgetPrivate; + friend class QQuickRenderControl; friend class QQuickAnimatorController; explicit QQuickWindow(QQuickRenderControl*); Q_DISABLE_COPY(QQuickWindow) |