diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9690bf4b631c8cc369977c4dfa4e9cf289d58529..cc4d80dde01a0addf65b1df34876b52c93cf913f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,8 +67,8 @@ job_test_gui_ubuntu: job_pages_smoke_test: stage: deploy - #tags: - # - ci-ubuntu-executor-docker + tags: + - ci-ubuntu-executor-docker image: morkolai/soitool-ci script: - mkdir public @@ -82,8 +82,8 @@ job_pages_smoke_test: # name has to be pages pages: stage: deploy - #tags: - # - ci-ubuntu-executor-docker + tags: + - ci-ubuntu-executor-docker image: morkolai/soitool-ci script: - mkdir public diff --git a/soitool/main_window.py b/soitool/main_window.py index 37d2728095ab2d652a8227fd96aab3f706165a5d..b0deab03e6dcc3a2eb2f6c9b290f2d3c0d6d95df 100644 --- a/soitool/main_window.py +++ b/soitool/main_window.py @@ -6,12 +6,12 @@ out to separate modules. """ import sys import os -from PySide2.QtCore import QRectF, QPoint, QTimer, Qt +from PySide2.QtCore import QRectF, QPoint, QTimer, Qt, QUrl from PySide2.QtWidgets import QTabWidget, QWidget, QMainWindow, \ QApplication, QHBoxLayout, QVBoxLayout, QPushButton, QLabel, \ QAbstractItemView, QListWidget, QListWidgetItem, QAction, QGraphicsScene, \ - QGraphicsView, QScrollArea, QGraphicsRectItem, QWebEngineView, \ - QWebEngineSettings, QUrl + QGraphicsView, QScrollArea, QGraphicsRectItem +from PySide2.QtWebEngineWidgets import QWebEngineView, QWebEngineSettings from PySide2.QtGui import QBrush, QIcon, QPalette, QFont, QPixmap from soitool.modules.module_table import TableModule