From 8aee10486211a8b549dcc2a9d42a4174b2ded1a0 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Fri, 21 Oct 2016 11:56:11 -0700
Subject: [PATCH] Qt: Work around gcc 4.8 bug

---
 src/platform/qt/Window.cpp | 16 ++++++++++++----
 src/platform/qt/Window.h   |  3 ++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index 3944e55ff..3a9a7982a 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -453,10 +453,18 @@ void Window::openAboutScreen() {
 	openView(about);
 }
 
-template <typename T, typename... Args>
-std::function<void()> Window::openTView(const Args&... args) {
-	return [this, args...]() {
-		T* view = new T(m_controller, args...);
+template <typename T, typename A>
+std::function<void()> Window::openTView(A arg) {
+	return [=]() {
+		T* view = new T(m_controller, arg);
+		openView(view);
+	};
+}
+
+template <typename T>
+std::function<void()> Window::openTView() {
+	return [=]() {
+		T* view = new T(m_controller);
 		openView(view);
 	};
 }
diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h
index 6a3ad94ae..6189fedd7 100644
--- a/src/platform/qt/Window.h
+++ b/src/platform/qt/Window.h
@@ -133,7 +133,8 @@ private:
 
 	void openView(QWidget* widget);
 
-	template <typename T, typename... Args> std::function<void()> openTView(const Args&...);
+	template <typename T, typename A> std::function<void()> openTView(A arg);
+	template <typename T> std::function<void()> openTView();
 
 	QAction* addControlledAction(QMenu* menu, QAction* action, const QString& name);
 	QAction* addHiddenAction(QMenu* menu, QAction* action, const QString& name);