Merge branch 'master' into 2.0
This commit is contained in:
@@ -12,8 +12,8 @@
|
||||
# pylint: disable=missing-module-docstring,missing-function-docstring,missing-class-docstring
|
||||
|
||||
# pylint: disable=no-name-in-module
|
||||
from PyKDDockWidgetsQt6 import KDDockWidgets
|
||||
from PySide6 import QtCore, QtWidgets, QtGui
|
||||
from PyKDDockWidgetsQt6 import KDDockWidgets
|
||||
|
||||
from MyWidget1 import MyWidget1
|
||||
from MyWidget2 import MyWidget2
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
|
||||
import sys
|
||||
|
||||
from MyMainWindow import MyMainWindow
|
||||
from PySide6 import QtWidgets, QtCore
|
||||
from MyMainWindow import MyMainWindow
|
||||
|
||||
try:
|
||||
# pylint: disable=unused-import
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
# pylint: disable=missing-module-docstring,missing-function-docstring,missing-class-docstring
|
||||
|
||||
# pylint: disable=no-name-in-module
|
||||
from PyKDDockWidgets import KDDockWidgets
|
||||
from PySide2 import QtCore, QtWidgets, QtGui
|
||||
from PyKDDockWidgets import KDDockWidgets
|
||||
|
||||
from MyWidget1 import MyWidget1
|
||||
from MyWidget2 import MyWidget2
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
|
||||
import sys
|
||||
|
||||
from MyMainWindow import MyMainWindow
|
||||
from PySide2 import QtWidgets, QtCore
|
||||
from MyMainWindow import MyMainWindow
|
||||
|
||||
try:
|
||||
# pylint: disable=unused-import
|
||||
|
||||
Reference in New Issue
Block a user