Misc osx+qt5 stuff

Makefile

@@ -15,7 +15,6 @@ SED_PREFIX = $(shell echo $(PREFIX) | sed "s/\//\\\\\\\\\//g")
 
 LINK = ln -sf
 
-ifneq ($(MACOS),true)
 ifeq ($(DEFAULT_QT),5)
 PYUIC ?= pyuic5
 PYRCC ?= pyrcc5
@@ -23,15 +22,6 @@ else
 PYUIC ?= pyuic4 -w
 PYRCC ?= pyrcc4 -py3
 endif
-else # MACOS
-ifeq ($(DEFAULT_QT),5)
-PYUIC ?= pyuic5-3.3
-PYRCC ?= pyrcc5-3.3
-else
-PYUIC ?= pyuic4-3.3 -w
-PYRCC ?= pyrcc4-3.3 -py3
-endif
-endif
 
 # --------------------------------------------------------------
 

source/Makefile.mk

@@ -399,10 +399,16 @@ MOC_QT5 ?= $(QT5_LIBDIR)/qt5/bin/moc
 RCC_QT5 ?= $(QT5_LIBDIR)/qt5/bin/rcc
 UIC_QT5 ?= $(QT5_LIBDIR)/qt5/bin/uic
 else
+ifeq ($(MACOS),true)
+MOC_QT5 ?= $(QT5_LIBDIR)/../bin/moc
+RCC_QT5 ?= $(QT5_LIBDIR)/../bin/rcc
+UIC_QT5 ?= $(QT5_LIBDIR)/../bin/uic
+else
 MOC_QT5 ?= $(QT5_LIBDIR)/qt/bin/moc
 RCC_QT5 ?= $(QT5_LIBDIR)/qt/bin/rcc
 UIC_QT5 ?= $(QT5_LIBDIR)/qt/bin/uic
 endif
 endif
+endif
 
 # --------------------------------------------------------------

source/carla_host.py

@@ -676,8 +676,8 @@ class HostWindow(QMainWindow):
                 folder = diskFolders[i]
                 self.ui.cb_disk.addItem(os.path.basename(folder), folder)
 
-            if MACOS and not settings.value(CARLA_KEY_MAIN_USE_PRO_THEME, True, type=bool):
-                self.setUnifiedTitleAndToolBarOnMac(True)
+            #if MACOS and not settings.value(CARLA_KEY_MAIN_USE_PRO_THEME, True, type=bool):
+            #    self.setUnifiedTitleAndToolBarOnMac(True)
 
         # ---------------------------------------------
 

source/carla_shared.py

@@ -56,10 +56,11 @@ from carla_backend import *
 
 if MACOS:
     if config_UseQt5:
-        from PyQt5.QtGui import qt_mac_set_menubar_icons
+        pass
+        #from PyQt5.QtGui import qt_mac_set_menubar_icons
     else:
         from PyQt4.QtGui import qt_mac_set_menubar_icons
-    qt_mac_set_menubar_icons(False)
+        qt_mac_set_menubar_icons(False)
 
 elif WINDOWS:
     WINDIR = os.getenv("WINDIR")