diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 15:04:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 15:32:19 +0200 |
| commit | 07782f48f4318a7261f1b0ddcd686b19ec812e36 (patch) | |
| tree | 3fa2aa3a1170ad7ebaf5b1641cdce19a941ca480 /examples | |
| parent | 50fcdfd705c2ad9560641986bf4152b017ee8bb6 (diff) | |
| parent | f15a90e5d10465e66698209a5d88f1e63ae336fa (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/qml/qml/qqmlbinding.cpp
src/qml/jsruntime/qv4arraybuffer.cpp
src/qml/jsruntime/qv4functionobject.cpp
Change-Id: Ic752e9dfd69b282093651c9234c110a49762f06d
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quick/rendercontrol/cuberenderer.cpp | 4 | ||||
| -rw-r--r-- | examples/quick/rendercontrol/window_multithreaded.cpp | 10 | ||||
| -rw-r--r-- | examples/quick/shared/Slider.qml | 3 | ||||
| -rw-r--r-- | examples/quick/shared/quick_shared.qrc | 3 |
4 files changed, 16 insertions, 4 deletions
diff --git a/examples/quick/rendercontrol/cuberenderer.cpp b/examples/quick/rendercontrol/cuberenderer.cpp index be503e3d8f..1b2d7dec8f 100644 --- a/examples/quick/rendercontrol/cuberenderer.cpp +++ b/examples/quick/rendercontrol/cuberenderer.cpp @@ -52,7 +52,9 @@ CubeRenderer::CubeRenderer(QOffscreenSurface *offscreenSurface) : m_offscreenSurface(offscreenSurface), m_context(0), m_program(0), - m_vbo(0) + m_vbo(0), + m_vao(0), + m_matrixLoc(0) { } diff --git a/examples/quick/rendercontrol/window_multithreaded.cpp b/examples/quick/rendercontrol/window_multithreaded.cpp index 6c0de93a19..9b6020a347 100644 --- a/examples/quick/rendercontrol/window_multithreaded.cpp +++ b/examples/quick/rendercontrol/window_multithreaded.cpp @@ -77,7 +77,12 @@ static const QEvent::Type STOP = QEvent::Type(QEvent::User + 4); static const QEvent::Type UPDATE = QEvent::Type(QEvent::User + 5); QuickRenderer::QuickRenderer() - : m_fbo(0), + : m_context(0), + m_surface(0), + m_fbo(0), + m_window(0), + m_quickWindow(0), + m_renderControl(0), m_cubeRenderer(0), m_quit(false) { @@ -209,7 +214,8 @@ void QuickRenderer::aboutToQuit() } WindowMultiThreaded::WindowMultiThreaded() - : m_rootItem(0), + : m_qmlComponent(Q_NULLPTR), + m_rootItem(0), m_quickInitialized(false), m_psrRequested(false) { diff --git a/examples/quick/shared/Slider.qml b/examples/quick/shared/Slider.qml index b3b2c98271..1728024715 100644 --- a/examples/quick/shared/Slider.qml +++ b/examples/quick/shared/Slider.qml @@ -44,6 +44,7 @@ Item { property real init: min+(max-min)/2 property string name: "Slider" property color color: "#0066cc" + property real minLabelWidth: 44 Component.onCompleted: setValue(init) function setValue(v) { @@ -57,7 +58,7 @@ Item { anchors.left: parent.left anchors.leftMargin: 16 height: childrenRect.height - width: Math.max(44, childrenRect.width) + width: Math.max(minLabelWidth, childrenRect.width) anchors.verticalCenter: parent.verticalCenter Text { text: slider.name + ":" diff --git a/examples/quick/shared/quick_shared.qrc b/examples/quick/shared/quick_shared.qrc index 015a1f99d5..ea7e0fdd89 100644 --- a/examples/quick/shared/quick_shared.qrc +++ b/examples/quick/shared/quick_shared.qrc @@ -7,5 +7,8 @@ <file>TextField.qml</file> <file>images/back.png</file> <file>images/next.png</file> + <file>images/checkmark.png</file> + <file>Slider.qml</file> + <file>images/slider_handle.png</file> </qresource> </RCC> |