# HG changeset patch
# User Chris Cannam
# Date 1385464618 0
# Node ID 9d6eadfd390e5278a755094a7281a58aa83c1182
# Parent  dc1bffb9614330843d02233fea50e9c9f3428290
WS -> OS

diff -r dc1bffb96143 -r 9d6eadfd390e .hgsubstate
--- a/.hgsubstate	Tue Nov 26 11:05:36 2013 +0000
+++ b/.hgsubstate	Tue Nov 26 11:16:58 2013 +0000
@@ -1,5 +1,5 @@
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
 3c5adc4a864fa75e5b1e67c260b77541aaa4f1f6 sv-dependency-builds
 3fc0df28953377c96e501f41db6fb80d29d6aa4a svapp
-e50a8fee67529803a1512d1ddd83eb6a76d853c4 svcore
-41029a6e55c6f24f94fc9b451d6498d6e9fa97af svgui
+23d3a6eca5c3d98f2875e1b1f58b17bb80c6414b svcore
+eaf4446a1bef283da661e0062f8495e0709f675c svgui
diff -r dc1bffb96143 -r 9d6eadfd390e main/PreferencesDialog.cpp
--- a/main/PreferencesDialog.cpp	Tue Nov 26 11:05:36 2013 +0000
+++ b/main/PreferencesDialog.cpp	Tue Nov 26 11:16:58 2013 +0000
@@ -191,7 +191,7 @@
     connect(showSplash, SIGNAL(stateChanged(int)),
             this, SLOT(showSplashChanged(int)));
 
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
     QComboBox *bgMode = new QComboBox;
     int bg = prefs->getPropertyRangeAndValue("Background Mode", &min, &max,
                                              &deflt);
@@ -315,7 +315,7 @@
                        row, 0);
     subgrid->addWidget(propertyLayout, row++, 1, 1, 2);
 
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
     subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel
                                                 ("Background Mode"))),
                        row, 0);