Skip to content

Commit 729f6b5

Browse files
committed
For #13673, wip
1 parent 52f533a commit 729f6b5

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

engine.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,14 @@ def init_engine(self):
106106

107107
def init_qt_app(self):
108108
self.logger.debug("%s: Initializing QtApp for Unreal", self)
109-
from sgtk.platform.qt5 import QtWidgets
110109

111-
if not QtWidgets.QApplication.instance():
112-
self._qt_app = QtWidgets.QApplication(sys.argv)
110+
from sgtk.platform.qt import QtGui
111+
112+
if not QtGui.QApplication.instance():
113+
self._qt_app = QtGui.QApplication(sys.argv)
113114
self._qt_app.setQuitOnLastWindowClosed(False)
114115
else:
115-
self._qt_app = QtWidgets.QApplication.instance()
116+
self._qt_app = QtGui.QApplication.instance()
116117

117118
# On other platforms than Windows, we need to process the Qt events otherwise
118119
# UIs are "frozen". We use a slate tick callback to do that on a regular basis.
@@ -131,8 +132,8 @@ def _process_qt_events_cb(delta_time):
131132
132133
:param float delta_time: delta time since the last run.
133134
"""
134-
from sgtk.platform.qt5 import QtWidgets
135-
qapp = QtWidgets.QApplication.instance()
135+
from sgtk.platform.qt import QtGui
136+
qapp = QtGui.QApplication.instance()
136137
if qapp:
137138
qapp.processEvents()
138139

startup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def prepare_launch(self, exec_path, args, file_to_open=None):
7272
# SG TK integration for now, just run the executable with its args. This
7373
# allows to launch Unreal from tk-desktop or submit turntable renders
7474
# from Maya to Unreal, without the integration crashing Unreal.
75-
if sys.platform == "darwin":
75+
if False and sys.platform == "darwin":
7676
self.logger.warning("SG TK Unreal integration is not available on Mac.")
7777
return LaunchInformation(exec_path, args, required_env)
7878

0 commit comments

Comments
 (0)