From c237378c3ec1e61331caed4fbb3faffbbcf4cc33 Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Wed, 11 Dec 2013 06:52:40 +0000 Subject: [PATCH] Fix #if in VideoWindow .. wrong logic in #if for Linux and Qt5 in both the header and source. --- src/VideoWindow.cpp | 2 +- src/VideoWindow.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/VideoWindow.cpp b/src/VideoWindow.cpp index 3aa927897..89a249946 100644 --- a/src/VideoWindow.cpp +++ b/src/VideoWindow.cpp @@ -89,7 +89,7 @@ VideoWindow::VideoWindow(Context *context, const QDir &home) : VideoWindow::~VideoWindow() { -#ifdef Q_OS_LINUX && QT_VERSION < 0x050000 //XXX IN PORT TO QT 5.1 THIS IS BROKEN CODE XXX +#if (defined Q_OS_LINUX) && (QT_VERSION < 0x050000) //XXX IN PORT TO QT 5.1 THIS IS BROKEN CODE XXX // unembed vlc backend first x11Container->discardClient(); #endif diff --git a/src/VideoWindow.h b/src/VideoWindow.h index 8a9189bc6..e5a0801ab 100644 --- a/src/VideoWindow.h +++ b/src/VideoWindow.h @@ -39,7 +39,7 @@ extern "C" { #include "RealtimeData.h" #include "TrainSidebar.h" -#ifdef Q_OS_LINUX && QT_VERSION < 0x050000 +#if (defined Q_OS_LINUX) && (QT_VERSION < 0x050000) #include #endif