diff --git a/mythplugins/mythgallery/mythgallery/gallerysettings.cpp b/mythplugins/mythgallery/mythgallery/gallerysettings.cpp
index c23db74..984b00f 100644
--- a/mythplugins/mythgallery/mythgallery/gallerysettings.cpp
+++ b/mythplugins/mythgallery/mythgallery/gallerysettings.cpp
@@ -39,7 +39,7 @@ static HostLineEdit *MythGalleryDir()
 {
     HostLineEdit *gc = new HostLineEdit("GalleryDir");
     gc->setLabel(QObject::tr("Directory that holds images"));
-#ifdef Q_WS_MACX
+#ifdef Q_OS_MAC
     gc->setValue(QDir::homePath() + "/Pictures");
 #else
     gc->setValue("/var/lib/pictures");
diff --git a/mythtv/libs/libmyth/mythcontext.cpp b/mythtv/libs/libmyth/mythcontext.cpp
index 3505b6d..c5cfa5c 100644
--- a/mythtv/libs/libmyth/mythcontext.cpp
+++ b/mythtv/libs/libmyth/mythcontext.cpp
@@ -244,7 +244,7 @@ void MythContextPrivate::TempMainWindow(bool languagePrompt)
     SilenceDBerrors();
 
     gCoreContext->OverrideSettingForSession("Theme", DEFAULT_UI_THEME);
-#ifdef Q_WS_MACX
+#ifdef Q_OS_MAC
     // Qt 4.4 has window-focus problems
     gCoreContext->OverrideSettingForSession("RunFrontendInWindow", "1");
 #endif
diff --git a/mythtv/libs/libmythbase/mythcommandlineparser.cpp b/mythtv/libs/libmythbase/mythcommandlineparser.cpp
index 3bbac88..cf2108a 100644
--- a/mythtv/libs/libmythbase/mythcommandlineparser.cpp
+++ b/mythtv/libs/libmythbase/mythcommandlineparser.cpp
@@ -1485,7 +1485,7 @@ bool MythCommandLineParser::Parse(int argc, const char * const * argv)
             return false;
         }
 
-#ifdef Q_WS_MACX
+#ifdef Q_OS_MAC
         if (opt.startsWith("-psn_"))
         {
             cerr << "Ignoring Process Serial Number from command line"
diff --git a/mythtv/libs/libmythmetadata/globals.cpp b/mythtv/libs/libmythmetadata/globals.cpp
index ae594e0..dd65bc4 100644
--- a/mythtv/libs/libmythmetadata/globals.cpp
+++ b/mythtv/libs/libmythmetadata/globals.cpp
@@ -29,7 +29,7 @@ const QString JUMP_VIDEO_TREE = "Video Listings";
 const QString JUMP_VIDEO_GALLERY = "Video Gallery";
 const QString JUMP_VIDEO_DEFAULT = "Video Default";
 
-#ifdef Q_WS_MACX
+#ifdef Q_OS_MAC
 const QString DEFAULT_VIDEOSTARTUP_DIR = QDir::homePath() + "/Movies";
 #else
 const QString DEFAULT_VIDEOSTARTUP_DIR = "/share/Movies/dvd";
diff --git a/mythtv/libs/libmythui/mythdisplay.cpp b/mythtv/libs/libmythui/mythdisplay.cpp
index 651a9a5..2bf6fb2 100644
--- a/mythtv/libs/libmythui/mythdisplay.cpp
+++ b/mythtv/libs/libmythui/mythdisplay.cpp
@@ -2,7 +2,7 @@
 #include "mythdisplay.h"
 #include "mythmainwindow.h"
 
-#if defined(Q_WS_MAC) 
+#if defined(Q_OS_MAC) 
 #import "util-osx.h"
 #elif USING_X11
 #include "mythxdisplay.h"
@@ -41,7 +41,7 @@ DisplayInfo MythDisplay::GetDisplayInfo(int video_rate)
 {
     DisplayInfo ret;
 
-#if defined(Q_WS_MAC)
+#if defined(Q_OS_MAC)
     CGDirectDisplayID disp = GetOSXDisplay(GetWindowID());
     if (!disp)
         return ret;
@@ -63,7 +63,7 @@ DisplayInfo MythDisplay::GetDisplayInfo(int video_rate)
     uint height = (uint)CGDisplayPixelsHigh(disp);
     ret.res     = QSize(width, height);
 
-#elif defined(Q_WS_WIN)
+#elif defined(Q_OS_WIN)
     HDC hdc = GetDC(GetWindowID());
     int rate = 0;
     if (hdc)
diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp
index 53ffe57..13ef2ad 100644
--- a/mythtv/libs/libmythui/mythmainwindow.cpp
+++ b/mythtv/libs/libmythui/mythmainwindow.cpp
@@ -1298,7 +1298,7 @@ void MythMainWindow::attach(QWidget *child)
         currentWidget()->setEnabled(false);
 
     d->widgetList.push_back(child);
-#ifndef Q_WS_MACX
+#ifndef Q_OS_MAC
     child->winId();
 #endif
     child->raise();
diff --git a/mythtv/libs/libmythui/mythrender_opengl.cpp b/mythtv/libs/libmythui/mythrender_opengl.cpp
index 10a9999..85ee086 100644
--- a/mythtv/libs/libmythui/mythrender_opengl.cpp
+++ b/mythtv/libs/libmythui/mythrender_opengl.cpp
@@ -76,7 +76,7 @@ MythRenderOpenGL* MythRenderOpenGL::Create(const QString &painter,
         LOG(VB_GENERAL, LOG_INFO, LOC + "Sync to VBlank is enabled (good!)");
     }
 
-#if defined(Q_WS_MAC)
+#if defined(Q_OS_MAC)
     LOG(VB_GENERAL, LOG_INFO, LOC + "Forcing swap interval for OS X.");
     setswapinterval = true;
 #endif
@@ -175,7 +175,7 @@ void MythRenderOpenGL::doneCurrent()
 
 void MythRenderOpenGL::Release(void)
 {
-#if !defined(Q_WS_WIN)
+#if !defined(Q_OS_WIN)
     while (m_lock_level > 0)
         doneCurrent();
 #endif
diff --git a/mythtv/libs/libmythui/mythrender_opengl.h b/mythtv/libs/libmythui/mythrender_opengl.h
index 2d15a5d..f5721b6 100644
--- a/mythtv/libs/libmythui/mythrender_opengl.h
+++ b/mythtv/libs/libmythui/mythrender_opengl.h
@@ -23,7 +23,7 @@
 #include <GL/glext.h>
 #endif
 
-#ifdef Q_WS_MACX
+#ifdef Q_OS_MAC
 #include "util-osx.h"
 #import <agl.h>
 #endif
diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
index 75fc5ee..b466067 100644
--- a/mythtv/programs/mythfrontend/globalsettings.cpp
+++ b/mythtv/programs/mythfrontend/globalsettings.cpp
@@ -3459,9 +3459,8 @@ OSDSettings::OSDSettings()
     //cc->addChild(DecodeVBIFormat());
     //addChild(cc);
 
-#if CONFIG_DARWIN
+#if Q_OS_MAC
     // Any Mac OS-specific OSD stuff would go here.
-    // Note that this define should be Q_WS_MACX
 #endif
 }
 
diff --git a/mythtv/programs/mythfrontend/main.cpp b/mythtv/programs/mythfrontend/main.cpp
index 0192097..1fc82dc 100644
--- a/mythtv/programs/mythfrontend/main.cpp
+++ b/mythtv/programs/mythfrontend/main.cpp
@@ -1467,7 +1467,7 @@ int main(int argc, char **argv)
 
     CleanupGuard callCleanup(cleanup);
 
-#ifdef Q_WS_MACX
+#ifdef Q_OS_MAC
     // Without this, we can't set focus to any of the CheckBoxSetting, and most
     // of the MythPushButton widgets, and they don't use the themed background.
     QApplication::setDesktopSettingsAware(false);
diff --git a/mythtv/programs/mythtv-setup/main.cpp b/mythtv/programs/mythtv-setup/main.cpp
index 36cd975..8fb33ac 100644
--- a/mythtv/programs/mythtv-setup/main.cpp
+++ b/mythtv/programs/mythtv-setup/main.cpp
@@ -276,7 +276,7 @@ int main(int argc, char *argv[])
 
     CleanupGuard callCleanup(cleanup);
 
-#ifdef Q_WS_MACX
+#ifdef Q_OS_MAC
     // Without this, we can't set focus to any of the CheckBoxSetting, and most
     // of the MythPushButton widgets, and they don't use the themed background.
     QApplication::setDesktopSettingsAware(FALSE);