MAINT: Fix some macos issues with opengl widgets

slew · Sep 15, 2020 · 60b030d · 60b030d
1 parent ecaa923
commit 60b030d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/applications/mne_analyze/mne_analyze/mne_analyze.pro b/applications/mne_analyze/mne_analyze/mne_analyze.pro
@@ -197,6 +197,14 @@ macx {
     loutrc.files = $${ROOT_DIR}/resources/general/2DLayouts
     QMAKE_BUNDLE_DATA += loutrc
 
+    # If Qt3D plugins/renderers folder exisits, create and copy renderers folder to mne-cpp/bin manually.
+    # macdeployqt does not deploy them. This will be fixed in Qt 5.15.2.
+    exists($$shell_path($$[QT_INSTALL_PLUGINS]/renderers)) {
+        qt3drenderers.path = Contents/PlugIns/
+        qt3drenderers.files = $$[QT_INSTALL_PLUGINS]/renderers
+        QMAKE_BUNDLE_DATA += qt3drenderers
+    }
+
     !contains(MNECPP_CONFIG, static) {
         # 3 entries returned in DEPLOY_CMD
         EXTRA_ARGS =

diff --git a/applications/mne_scan/mne_scan/mne_scan.pro b/applications/mne_scan/mne_scan/mne_scan.pro
@@ -39,11 +39,7 @@ include(../../../mne-cpp.pri)
 
 TEMPLATE = app
 
-QT += network core widgets xml svg charts concurrent opengl
-
-qtHaveModule(3dextras) {
-    QT += 3dextras
-}
+QT += network core widgets xml svg charts concurrent opengl 3dextras
 
 CONFIG += console
 
@@ -222,6 +218,14 @@ macx {
     plugins.files = $${ROOT_DIR}/bin/mne_scan_plugins
     QMAKE_BUNDLE_DATA += plugins
 
+    # If Qt3D plugins/renderers folder exisits, create and copy renderers folder to mne-cpp/bin manually.
+    # macdeployqt does not deploy them. This will be fixed in Qt 5.15.2.
+    exists($$shell_path($$[QT_INSTALL_PLUGINS]/renderers)) {
+        qt3drenderers.path = Contents/PlugIns/
+        qt3drenderers.files = $$[QT_INSTALL_PLUGINS]/renderers
+        QMAKE_BUNDLE_DATA += qt3drenderers
+    }
+
     !contains(MNECPP_CONFIG, static) {
         # 3 entries returned in DEPLOY_CMD
         EXTRA_ARGS =

diff --git a/mne-cpp.pri b/mne-cpp.pri
@@ -141,6 +141,15 @@ contains(MNECPP_CONFIG, static) {
     message("The static flag was detected. Building static version of MNE-CPP.")
 }
 
+# Some MacOS specific setups
+macx {
+    # Do not support OpenGL support on macx because signal backgrounds are not plotted correctly (tested on Qt 5.15.0 and Qt 5.15.1)
+    MNECPP_CONFIG += noOpenGL
+
+    # Suppress untested SDK version checks
+    CONFIG += sdk_no_version_check
+}
+
 ########################################### DIRECTORY DEFINITIONS #############################################
 
 # Eigen dir

diff --git a/mne-cpp.pro b/mne-cpp.pro
@@ -64,3 +64,4 @@ libraries.depends =
 applications.depends = libraries
 examples.depends = libraries
 testframes.depends = libraries
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -64,3 +64,4 @@ libraries.depends =
		applications.depends = libraries
		examples.depends = libraries
		testframes.depends = libraries