Skip to content

Commit

Permalink
Re-enable --disable-x11 builds
Browse files Browse the repository at this point in the history
Slightly changes a symbol used in [7e621b6]. Closes #9477.
Only tested on Linux and Mac OS X.
  • Loading branch information
NigelPearson committed Jan 26, 2011
1 parent 636542c commit 8f6f7aa
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions mythtv/libs/libmythui/mythdisplay.cpp
Expand Up @@ -5,7 +5,7 @@
#import "util-osx.h"
#elif defined(Q_WS_WIN)
#include <windows.h>
#elif defined(Q_WS_X11)
#elif USING_X11
#include "mythxdisplay.h"
#elif USING_DIRECTFB
#include <linux/fb.h>
Expand All @@ -15,7 +15,7 @@ extern "C" {
}
#endif

#if !defined(Q_WS_X11)
#if !USING_X11
#include <QApplication>
#include <QDesktopWidget>
#endif
Expand Down Expand Up @@ -101,7 +101,7 @@ DisplayInfo MythDisplay::GetDisplayInfo(int video_rate)
else
ret.rate = fix_rate(video_rate);

#elif defined (Q_WS_X11)
#elif USING_X11
MythXDisplay *disp = OpenMythXDisplay();
if (!disp)
return ret;
Expand Down Expand Up @@ -166,7 +166,7 @@ int MythDisplay::GetNumberXineramaScreens(void)
{
int nr_xinerama_screens = 0;

#if defined(Q_WS_X11)
#if USING_X11
// TODO Qt is Xinerama aware so this should be unnecessary
MythXDisplay *d = OpenMythXDisplay();
if (d)
Expand Down

0 comments on commit 8f6f7aa

Please sign in to comment.