Merge pull request #1211 from andyjenkinson/next

Updates for Mac - needs testing on other platforms

companion/src/CMakeLists.txt

@@ -42,18 +42,14 @@ SET( QT_USE_QTNETWORK True )
 SET( QT_USE_QTXML True )
 INCLUDE( ${QT_USE_FILE} )
 
-IF ( APPLE )
-    MESSAGE( STATUS "Phonon still not supported on APPLE " )
+MESSAGE( STATUS "Looking for PHONON " )
+FIND_PACKAGE(Phonon)
+IF ( PHONON_FOUND )
+    INCLUDE_DIRECTORIES( ${PHONO_INCLUDE_DIR} )
+    MESSAGE("PHONON Include Path: " ${PHONON_INCLUDE_DIR} )
+    ADD_DEFINITIONS( -DPHONON )
 ELSE()
-    MESSAGE( STATUS "Looking for PHONON " )
-    FIND_PACKAGE(Phonon)
-    IF ( PHONON_FOUND )
-        INCLUDE_DIRECTORIES( ${PHONO_INCLUDE_DIR} )
-        MESSAGE("PHONON Include Path: " ${PHONON_INCLUDE_DIR} )
-        ADD_DEFINITIONS( -DPHONON )
-    ELSE()
-        MESSAGE( "PHONON not found!" )
-    ENDIF()
+    MESSAGE( "PHONON not found!" )
 ENDIF()
 
 ADD_CUSTOM_COMMAND(

companion/src/wizarddialog.cpp

@@ -51,7 +51,13 @@ WizardDialog::WizardDialog(const GeneralSettings & settings, unsigned int modelI
     "Please note that continuing removes all old model settings!"), -1));
   setStartId(Page_Models);
 
+  // Workaround for Qt radio button rendering issue on Mac
+  Q_FOREACH(QAbstractButton * rb, findChildren<QAbstractButton *>()) {
+    rb->setAttribute(Qt::WA_LayoutUsesWidgetRect);
+  }
+
   setWizardStyle(ModernStyle);
+  setOption(QWizard::NoCancelButton, false);
   setOption(HaveHelpButton, true);
   connect(this, SIGNAL(helpRequested()), this, SLOT(showHelp()));