From 6fe62cd143819665bb8a497d3d4583efd409c9c7 Mon Sep 17 00:00:00 2001
From: thomahl <thomahl@stud.ntnu.no>
Date: Fri, 6 Mar 2020 10:27:56 +0100
Subject: [PATCH] #35 fikset feil import & bruker ny runner
---
.gitlab-ci.yml | 8 ++++----
soitool/main_window.py | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9690bf4..cc4d80d 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 37d2728..b0deab0 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
--
GitLab