From 704069eb37d756978a4b0d022d8301115044c44e Mon Sep 17 00:00:00 2001
From: Mikkel Krautz <mikkel@krautz.dk>
Date: Thu, 8 Dec 2016 22:40:11 +0100
Subject: [PATCH 1/2] DeveloperConsole: drop QPointer::clear() call. It is
 unnecessary, and the clear() method is Qt 5-only.

---
 src/mumble/DeveloperConsole.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/mumble/DeveloperConsole.cpp b/src/mumble/DeveloperConsole.cpp
index 67aa4662a..d9d9ebd9f 100644
--- a/src/mumble/DeveloperConsole.cpp
+++ b/src/mumble/DeveloperConsole.cpp
@@ -18,7 +18,6 @@ DeveloperConsole::DeveloperConsole(QObject *parent)
 
 DeveloperConsole::~DeveloperConsole() {
 	QMainWindow *mw = m_window.data();
-	m_window.clear();
 	delete mw;
 }
 

From 74f5930e1ceac5adf807444ddfbb64ec655f21a6 Mon Sep 17 00:00:00 2001
From: Mikkel Krautz <mikkel@krautz.dk>
Date: Thu, 8 Dec 2016 22:41:24 +0100
Subject: [PATCH 2/2] *.pro: use 'linux*' instead of 'linux' for Linux
 conditionals.

This makes the check Qt 4-compatible.
---
 overlay_gl/overlay_gl.pro | 2 +-
 plugins/link/link.pro     | 2 +-
 src/mumble/mumble.pro     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/overlay_gl/overlay_gl.pro b/overlay_gl/overlay_gl.pro
index 9d1d951ac..b9bb0b574 100644
--- a/overlay_gl/overlay_gl.pro
+++ b/overlay_gl/overlay_gl.pro
@@ -21,7 +21,7 @@ unix:!macx {
 	TARGET = mumble$(TARGET_ADD)
 
 	DEFINES += TARGET_UNIX
-	linux {
+	linux* {
 		LIBS *= -lrt -ldl
 	}
 	QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD)
diff --git a/plugins/link/link.pro b/plugins/link/link.pro
index 3905bc3d9..cbb090c33 100644
--- a/plugins/link/link.pro
+++ b/plugins/link/link.pro
@@ -15,7 +15,7 @@ win32 {
 unix {
 	SOURCES		= link-posix.cpp
 
-        linux {
+        linux* {
 		LIBS          += -lrt
 	}
 }
diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro
index dc1967445..a8f776b76 100644
--- a/src/mumble/mumble.pro
+++ b/src/mumble/mumble.pro
@@ -473,7 +473,7 @@ unix {
     HEADERS *= GlobalShortcut_unix.h
     SOURCES *= os_unix.cpp GlobalShortcut_unix.cpp TextToSpeech_unix.cpp Overlay_unix.cpp SharedMemory_unix.cpp Log_unix.cpp
     must_pkgconfig(x11)
-    linux {
+    linux* {
       LIBS *= -lrt
     }
     LIBS *= -lXi