mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #2703: Qt 4-related FTBFS issues

Browse Source
This commit is contained in:
Mikkel Krautz 2016-12-08 22:47:09 +01:00 committed by GitHub
commit be79bffe10
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
overlay_gl/overlay_gl.pro
View File

@ -21,7 +21,7 @@ unix:!macx {
TARGET = mumble$(TARGET_ADD)
DEFINES += TARGET_UNIX
linux {
linux* {
LIBS *= -lrt -ldl
}
QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD)

2
plugins/link/link.pro
View File

@ -15,7 +15,7 @@ win32 {
unix {
SOURCES = link-posix.cpp
linux {
linux* {
LIBS += -lrt
}
}

1
src/mumble/DeveloperConsole.cpp
View File

@ -18,7 +18,6 @@ DeveloperConsole::DeveloperConsole(QObject *parent)
DeveloperConsole::~DeveloperConsole() {
QMainWindow *mw = m_window.data();
m_window.clear();
delete mw;
}

2
src/mumble/mumble.pro
View File

@ -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