diff options
Diffstat (limited to 'examples/quick/rendercontrol/window_singlethreaded.cpp')
| -rw-r--r-- | examples/quick/rendercontrol/window_singlethreaded.cpp | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/examples/quick/rendercontrol/window_singlethreaded.cpp b/examples/quick/rendercontrol/window_singlethreaded.cpp index bd4de9a7cb..ddbbfe4b52 100644 --- a/examples/quick/rendercontrol/window_singlethreaded.cpp +++ b/examples/quick/rendercontrol/window_singlethreaded.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: ** ** "Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions are @@ -60,7 +70,7 @@ class RenderControl : public QQuickRenderControl { public: RenderControl(QWindow *w) : m_window(w) { } - QWindow *renderWindow(QPoint *offset) Q_DECL_OVERRIDE; + QWindow *renderWindow(QPoint *offset) override; private: QWindow *m_window; @@ -74,8 +84,8 @@ QWindow *RenderControl::renderWindow(QPoint *offset) } WindowSingleThreaded::WindowSingleThreaded() - : m_rootItem(0), - m_fbo(0), + : m_rootItem(nullptr), + m_fbo(nullptr), m_quickInitialized(false), m_quickReady(false), m_dpr(0) @@ -181,7 +191,7 @@ void WindowSingleThreaded::createFbo() void WindowSingleThreaded::destroyFbo() { delete m_fbo; - m_fbo = 0; + m_fbo = nullptr; } void WindowSingleThreaded::render() |