comparison main/MainWindow.cpp @ 1463:f5c828d1f3e2 3.0-integration

Store/recall colours by hex name; simpler and more general (was having trouble with reloading on Mac). Also update subrepos inc PortAudio build

     QString defaultColourName(tr("Green"));
     if (m_viewManager && m_viewManager->getGlobalDarkBackground()) {
         defaultColourName = tr("Bright Green");
     }
     ColourDatabase *cdb = ColourDatabase::getInstance();
-    QColor colour =
-        ((settings.value("overview-colour", cdb->getColour(defaultColourName)))
-         .value<QColor>());
+    QColor colour = QColor
+        (settings.value("overview-colour",
+                        cdb->getColour(defaultColourName).name()).toString());
     settings.endGroup();
 
     int index = cdb->getColourIndex(colour);
     if (index >= 0) {
         m_panLayer->setBaseColour(index);