diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2018-10-07 10:40:17 +0200 |
|---|---|---|
| committer | Hans Verkuil <hans.verkuil@cisco.com> | 2018-10-07 10:40:17 +0200 |
| commit | 5287fcd5259bf096564fad68d1f26a0d9c373b72 (patch) | |
| tree | 3bfe7d337507506fbbabdc21169c874e1e4d7e3c /utils/qvidcap/capture-win-gl.cpp | |
| parent | 420c76a642eb3b52b52860674ef8c8135d137e0d (diff) | |
qvidcap: add parent when creating QAction objects.
The QAction constructor has a parent pointer which is optional in
Qt >= 5.7. In order to compile under older Qt versions set the parent
explicitly.
Based on a patch from Gregor Jasny <gjasny@googlemail.com>.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Suggested-by: Gregor Jasny <gjasny@googlemail.com>
Diffstat (limited to 'utils/qvidcap/capture-win-gl.cpp')
| -rw-r--r-- | utils/qvidcap/capture-win-gl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/qvidcap/capture-win-gl.cpp b/utils/qvidcap/capture-win-gl.cpp index c415f9a9..224c1340 100644 --- a/utils/qvidcap/capture-win-gl.cpp +++ b/utils/qvidcap/capture-win-gl.cpp @@ -277,16 +277,16 @@ CaptureGLWin::CaptureGLWin(QScrollArea *sa, QWidget *parent) : addSubMenuItem(grp, menu, "Window Scrollbars", CAPTURE_GL_WIN_SCROLLBAR)->setChecked(false); connect(grp, SIGNAL(triggered(QAction *)), this, SLOT(windowScalingChanged(QAction *))); - m_resolutionOverride = new QAction("Override resolution"); + m_resolutionOverride = new QAction("Override resolution", this); m_resolutionOverride->setCheckable(true); connect(m_resolutionOverride, SIGNAL(triggered(bool)), this, SLOT(resolutionOverrideChanged(bool))); - m_enterFullScreen = new QAction("Enter fullscreen (F)"); + m_enterFullScreen = new QAction("Enter fullscreen (F)", this); connect(m_enterFullScreen, SIGNAL(triggered(bool)), this, SLOT(toggleFullScreen(bool))); - m_exitFullScreen = new QAction("Exit fullscreen (F or Esc)"); + m_exitFullScreen = new QAction("Exit fullscreen (F or Esc)", this); connect(m_exitFullScreen, SIGNAL(triggered(bool)), this, SLOT(toggleFullScreen(bool))); } |