HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1503:3d021c06fb3c

Force PySide2 usage for QtConsole...

jeandet -

r1503:3d021c06fb3c

parent child

Context file:

r1503:3d021c06fb3c

app/PySide2-bindings/main.py +2 -1

             # This Python file uses the following encoding: utf-8
             import os
+            import os
+            os.environ['QT_API'] = 'pyside2'
             print(os.getcwd())
             import sys
             from PySide2.QtWidgets import QApplication, QMainWindow, QDockWidget
             from PySide2.QtCore import QSize, Qt
             from PySide2 import QtGui
-            import os
             sys.path.append(os.getcwd())
             from SciQLopBindings import SqpApplication, MainWindow, init_resources, load_plugins, SqpApplication_ctor
             from qtconsole.rich_ipython_widget import RichJupyterWidget

app/PySide2-bindings/meson.build +2 -2

             pymod = import('python')
             python3 = pymod.find_installation('python3', modules:['PySide2','shiboken2', 'shiboken2_generator', 'numpy'])
-            python3_dep = python3.dependency()
+            python3_dep = python3.dependency(embed:true)
             numpy_inc = run_command(python3, '-c', 'import numpy;print(numpy.get_include())').stdout().strip('\n')
             qt5_modules = ['QtCore','QtGui','QtWidgets']
             configure_file(input:'main.py', output:'main.py', copy:true)
-            executable('sciqlop', 'main.cpp', dependencies :python3.dependency())
+            executable('sciqlop', 'main.cpp', dependencies :python3_dep)

core +1 -1

	@@ -1,1 +1,1
	1	Subproject commit 3bce297cb13e8337d71adceae6737c104c66ad52		1	Subproject commit 5d9a96289564d5cba1a9ba21c901645d39fbcbad

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages