# HG changeset patch
# User Chris Cannam
# Date 1453224506 0
# Node ID 88f3978cb0dfa967165a987b58f075d357b6f598
# Parent  36de09aaa614e00d1501fbb57753b4db9c9daa74# Parent  2661bc23155e01037a2e1846c8e51df6c705509c
Merge from branch colourschemes

diff -r 36de09aaa614 -r 88f3978cb0df .hgsubstate
--- a/.hgsubstate	Tue Jan 19 12:34:38 2016 +0000
+++ b/.hgsubstate	Tue Jan 19 17:28:26 2016 +0000
@@ -1,9 +1,9 @@
-3436df58863b2eb00f013605b43aef33676ab45d bqaudioio
+e09d3c02709624b266b62b63a6218d4f330b677e bqaudioio
 62c40e7f9231e459091c3352c5d4b6001be127ca bqresample
 94b6ebd5e8ab897e5b294fd77b4113e8d6d78b13 bqvec
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 68ae618c6b0e442d08a71d39217784a08f2a8de3 icons/scalable
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
-39e94df71d24b92f30f8215cb542d6e481e42281 svapp
+14a81e881b1ae7ade2520611c902a20971d9898d svapp
 afed8be790321ebc805b2620bcddb91405886c8d svcore
-7242fe160c19015cf79440223b2f998236ea205f svgui
+6a8084c72e7a8fd663089269f6af2b250aea0835 svgui
diff -r 36de09aaa614 -r 88f3978cb0df main/PreferencesDialog.cpp
--- a/main/PreferencesDialog.cpp	Tue Jan 19 12:34:38 2016 +0000
+++ b/main/PreferencesDialog.cpp	Tue Jan 19 17:28:26 2016 +0000
@@ -210,7 +210,7 @@
     connect(showSplash, SIGNAL(stateChanged(int)),
             this, SLOT(showSplashChanged(int)));
 
-#ifndef Q_OS_MAC
+#ifdef NOT_DEFINED // This no longer works correctly on any platform AFAICS
     QComboBox *bgMode = new QComboBox;
     int bg = prefs->getPropertyRangeAndValue("Background Mode", &min, &max,
                                              &deflt);
@@ -377,7 +377,7 @@
                        row, 0);
     subgrid->addWidget(propertyLayout, row++, 1, 1, 2);
 
-#ifndef Q_OS_MAC
+#ifdef NOT_DEFINED // see earlier
     subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel
                                                 ("Background Mode"))),
                        row, 0);