From 3d021c06fb3c9e3e054d52a17be6d4b9ab5acbb0 2020-09-01 09:11:05 From: Alexis Jeandet Date: 2020-09-01 09:11:05 Subject: [PATCH] Force PySide2 usage for QtConsole Signed-off-by: Alexis Jeandet --- diff --git a/app/PySide2-bindings/main.py b/app/PySide2-bindings/main.py index ce03c19..2f0af58 100644 --- a/app/PySide2-bindings/main.py +++ b/app/PySide2-bindings/main.py @@ -1,11 +1,12 @@ # 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 diff --git a/app/PySide2-bindings/meson.build b/app/PySide2-bindings/meson.build index a59169a..42333ab 100644 --- a/app/PySide2-bindings/meson.build +++ b/app/PySide2-bindings/meson.build @@ -3,7 +3,7 @@ qmake = find_program('qmake-qt5','qmake') 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'] @@ -47,4 +47,4 @@ sciqlop_bindings = python3.extension_module('SciQLopBindings',sciqlop_bindings_s configure_file(input:'main.py', output:'main.py', copy:true) -executable('sciqlop', 'main.cpp', dependencies :python3.dependency()) +executable('sciqlop', 'main.cpp', dependencies :python3_dep) diff --git a/core b/core index 3bce297..5d9a962 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 3bce297cb13e8337d71adceae6737c104c66ad52 +Subproject commit 5d9a96289564d5cba1a9ba21c901645d39fbcbad