aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/tests/QtQml
diff options
context:
space:
mode:
Diffstat (limited to 'sources/pyside2/tests/QtQml')
-rw-r--r--sources/pyside2/tests/QtQml/bug_451.py2
-rw-r--r--sources/pyside2/tests/QtQml/bug_456.py3
-rw-r--r--sources/pyside2/tests/QtQml/bug_557.py2
-rw-r--r--sources/pyside2/tests/QtQml/bug_726.py3
-rw-r--r--sources/pyside2/tests/QtQml/bug_814.py3
-rw-r--r--sources/pyside2/tests/QtQml/bug_825.py2
-rw-r--r--sources/pyside2/tests/QtQml/bug_847.py3
-rw-r--r--sources/pyside2/tests/QtQml/bug_915.py2
-rw-r--r--sources/pyside2/tests/QtQml/bug_926.py2
-rw-r--r--sources/pyside2/tests/QtQml/bug_951.py3
-rw-r--r--sources/pyside2/tests/QtQml/bug_995.py3
-rw-r--r--sources/pyside2/tests/QtQml/bug_997.py3
-rw-r--r--sources/pyside2/tests/QtQml/connect_python_qml.py3
-rw-r--r--sources/pyside2/tests/QtQml/javascript_exceptions.py3
-rw-r--r--sources/pyside2/tests/QtQml/qqmlincubator_incubateWhile.py2
-rw-r--r--sources/pyside2/tests/QtQml/qqmlnetwork_test.py4
-rw-r--r--sources/pyside2/tests/QtQml/qquickitem_grabToImage.py4
-rw-r--r--sources/pyside2/tests/QtQml/qquickview_test.py3
-rw-r--r--sources/pyside2/tests/QtQml/registertype.py4
-rw-r--r--sources/pyside2/tests/QtQml/signal_arguments.py4
20 files changed, 37 insertions, 21 deletions
diff --git a/sources/pyside2/tests/QtQml/bug_451.py b/sources/pyside2/tests/QtQml/bug_451.py
index b6d1da5d0..f6405ffc8 100644
--- a/sources/pyside2/tests/QtQml/bug_451.py
+++ b/sources/pyside2/tests/QtQml/bug_451.py
@@ -39,7 +39,7 @@ import unittest
sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
-from helper import adjust_filename
+from helper.helper import adjust_filename
from PySide2 import QtCore, QtGui, QtQuick
diff --git a/sources/pyside2/tests/QtQml/bug_456.py b/sources/pyside2/tests/QtQml/bug_456.py
index 7ac2f21c2..0ecc012f8 100644
--- a/sources/pyside2/tests/QtQml/bug_456.py
+++ b/sources/pyside2/tests/QtQml/bug_456.py
@@ -32,7 +32,8 @@ import unittest
sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
-from helper import adjust_filename, TimedQApplication
+from helper.helper import adjust_filename
+from helper.timedqapplication import TimedQApplication
from PySide2 import QtCore, QtGui, QtQuick
diff --git a/sources/pyside2/tests/QtQml/bug_557.py b/sources/pyside2/tests/QtQml/bug_557.py
index a697bcd07..a8b330865 100644
--- a/sources/pyside2/tests/QtQml/bug_557.py
+++ b/sources/pyside2/tests/QtQml/bug_557.py
@@ -32,7 +32,7 @@ import unittest
sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
-from helper import adjust_filename
+from helper.helper import adjust_filename
from PySide2.QtCore import QUrl
from PySide2.QtGui import QGuiApplication
diff --git a/sources/pyside2/tests/QtQml/bug_726.py b/sources/pyside2/tests/QtQml/bug_726.py
index e4854eab0..4594a43b6 100644
--- a/sources/pyside2/tests/QtQml/bug_726.py
+++ b/sources/pyside2/tests/QtQml/bug_726.py
@@ -32,7 +32,8 @@ import unittest
sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
-from helper import adjust_filename, TimedQApplication
+from helper.helper import adjust_filename
+from helper.timedqapplication import TimedQApplication
from PySide2 import QtCore, QtGui, QtQuick
diff --git a/sources/pyside2/tests/QtQml/bug_814.py b/sources/pyside2/tests/QtQml/bug_814.py
index 5387cd1f5..5b38f134d 100644
--- a/sources/pyside2/tests/QtQml/bug_814.py
+++ b/sources/pyside2/tests/QtQml/bug_814.py
@@ -43,7 +43,8 @@ import unittest
sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
-from helper import adjust_filename, TimedQApplication
+from helper.helper import adjust_filename
+from helper.timedqapplication import TimedQApplication
from PySide2.QtCore import QUrl, QAbstractListModel, QModelIndex, Qt
from PySide2.QtQuick import QQuickView
diff --git a/sources/pyside2/tests/QtQml/bug_825.py b/sources/pyside2/tests/QtQml/bug_825.py
index 4592a0f24..fcf0fac28 100644
--- a/sources/pyside2/tests/QtQml/bug_825.py
+++ b/sources/pyside2/tests/QtQml/bug_825.py
@@ -32,7 +32,7 @@ import unittest
sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
-from helper import adjust_filename
+from helper.helper import adjust_filename
from PySide2.QtCore import Qt, QUrl, QTimer
from PySide2.QtGui import QGuiApplication, QPen
diff --git a/sources/pyside2/tests/QtQml/bug_847.py b/sources/pyside2/tests/QtQml/bug_847.py
index b88bffefb..7347e1649 100644
--- a/sources/pyside2/tests/QtQml/bug_847.py
+++ b/sources/pyside2/tests/QtQml/bug_847.py
@@ -42,7 +42,8 @@ import unittest
sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
-from helper import adjust_filename, UsesQApplication
+from helper.helper import adjust_filename
+from helper.usesqapplication import UsesQApplication
from PySide2.QtCore import Slot, Signal, QUrl, QTimer, QCoreApplication
from PySide2.QtQuick import QQuickView
diff --git a/sources/pyside2/tests/QtQml/bug_915.py b/sources/pyside2/tests/QtQml/bug_915.py
index 5e80fcc2f..74cc30d4c 100644
--- a/sources/pyside2/tests/QtQml/bug_915.py
+++ b/sources/pyside2/tests/QtQml/bug_915.py
@@ -35,7 +35,7 @@ import unittest
sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
-from helper import TimedQApplication
+from helper.timedqapplication import TimedQApplication
from PySide2.QtQuick import QQuickView, QQuickItem
diff --git a/sources/pyside2/tests/QtQml/bug_926.py b/sources/pyside2/tests/QtQml/bug_926.py
index 865e61129..2eb958d89 100644
--- a/sources/pyside2/tests/QtQml/bug_926.py
+++ b/sources/pyside2/tests/QtQml/bug_926.py
@@ -33,7 +33,7 @@ import unittest
sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
-from helper import adjust_filename
+from helper.helper import adjust_filename
from PySide2.QtCore import QUrl, QTimer, QObject, Signal, Property
from PySide2.QtGui import QGuiApplication
diff --git a/sources/pyside2/tests/QtQml/bug_951.py b/sources/pyside2/tests/QtQml/bug_951.py
index 16399e62b..2223b2a50 100644
--- a/sources/pyside2/tests/QtQml/bug_951.py
+++ b/sources/pyside2/tests/QtQml/bug_951.py
@@ -32,7 +32,8 @@ import unittest
sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
-from helper import adjust_filename, TimedQApplication
+from helper.helper import adjust_filename
+from helper.timedqapplication import TimedQApplication
from PySide2.QtCore import QUrl
from PySide2.QtQml import qmlRegisterType
diff --git a/sources/pyside2/tests/QtQml/bug_995.py b/sources/pyside2/tests/QtQml/bug_995.py
index 2ffc38c9e..9a83a8110 100644
--- a/sources/pyside2/tests/QtQml/bug_995.py
+++ b/sources/pyside2/tests/QtQml/bug_995.py
@@ -32,7 +32,8 @@ import unittest
sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
-from helper import adjust_filename, UsesQApplication
+from helper.helper import adjust_filename
+from helper.usesqapplication import UsesQApplication
from PySide2.QtGui import QGuiApplication
from PySide2.QtQuick import QQuickView
diff --git a/sources/pyside2/tests/QtQml/bug_997.py b/sources/pyside2/tests/QtQml/bug_997.py
index fdb6c6c8d..9d4efff71 100644
--- a/sources/pyside2/tests/QtQml/bug_997.py
+++ b/sources/pyside2/tests/QtQml/bug_997.py
@@ -32,7 +32,8 @@ import unittest
sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
-from helper import adjust_filename, UsesQApplication
+from helper.helper import adjust_filename
+from helper.usesqapplication import UsesQApplication
from PySide2 import QtCore, QtQml, QtQuick
diff --git a/sources/pyside2/tests/QtQml/connect_python_qml.py b/sources/pyside2/tests/QtQml/connect_python_qml.py
index 6e265ae3c..31569b7aa 100644
--- a/sources/pyside2/tests/QtQml/connect_python_qml.py
+++ b/sources/pyside2/tests/QtQml/connect_python_qml.py
@@ -39,7 +39,8 @@ import unittest
sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
-from helper import adjust_filename, TimedQApplication
+from helper.helper import adjust_filename
+from helper.timedqapplication import TimedQApplication
from PySide2 import QtCore, QtGui, QtQuick
diff --git a/sources/pyside2/tests/QtQml/javascript_exceptions.py b/sources/pyside2/tests/QtQml/javascript_exceptions.py
index fc7aba205..2cf81fc80 100644
--- a/sources/pyside2/tests/QtQml/javascript_exceptions.py
+++ b/sources/pyside2/tests/QtQml/javascript_exceptions.py
@@ -32,7 +32,8 @@ import unittest
sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
-from helper import adjust_filename, UsesQApplication
+from helper.helper import adjust_filename
+from helper.usesqapplication import UsesQApplication
from PySide2.QtCore import Slot, Property, Signal, QObject, QUrl
from PySide2.QtQml import QJSEngine, qmlRegisterType
diff --git a/sources/pyside2/tests/QtQml/qqmlincubator_incubateWhile.py b/sources/pyside2/tests/QtQml/qqmlincubator_incubateWhile.py
index 9adcdcaf7..281646545 100644
--- a/sources/pyside2/tests/QtQml/qqmlincubator_incubateWhile.py
+++ b/sources/pyside2/tests/QtQml/qqmlincubator_incubateWhile.py
@@ -35,7 +35,7 @@ import unittest
sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
-from helper import adjust_filename
+from helper.helper import adjust_filename
from PySide2.QtCore import QObject, QUrl, Slot, QTimer
from PySide2.QtGui import QGuiApplication
diff --git a/sources/pyside2/tests/QtQml/qqmlnetwork_test.py b/sources/pyside2/tests/QtQml/qqmlnetwork_test.py
index 74c87eac5..4ea5f8d19 100644
--- a/sources/pyside2/tests/QtQml/qqmlnetwork_test.py
+++ b/sources/pyside2/tests/QtQml/qqmlnetwork_test.py
@@ -41,7 +41,9 @@ from PySide2.QtQuick import QQuickView
from PySide2.QtQml import QQmlNetworkAccessManagerFactory
from PySide2.QtNetwork import QNetworkAccessManager
-from helper import adjust_filename, TimedQApplication
+from helper.helper import adjust_filename
+from helper.timedqapplication import TimedQApplication
+
class CustomManager(QNetworkAccessManager):
def createRequest(self, op, req, data = None):
diff --git a/sources/pyside2/tests/QtQml/qquickitem_grabToImage.py b/sources/pyside2/tests/QtQml/qquickitem_grabToImage.py
index 8e7e07997..a9618a92a 100644
--- a/sources/pyside2/tests/QtQml/qquickitem_grabToImage.py
+++ b/sources/pyside2/tests/QtQml/qquickitem_grabToImage.py
@@ -32,7 +32,9 @@ import unittest
sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
-from helper import adjust_filename, TimedQApplication
+from helper.helper import adjust_filename
+from helper.timedqapplication import TimedQApplication
+
from PySide2 import QtCore, QtGui, QtQuick
class TestGrabToSharedPointerImage(TimedQApplication):
diff --git a/sources/pyside2/tests/QtQml/qquickview_test.py b/sources/pyside2/tests/QtQml/qquickview_test.py
index 6edaf64e0..e0b35dc59 100644
--- a/sources/pyside2/tests/QtQml/qquickview_test.py
+++ b/sources/pyside2/tests/QtQml/qquickview_test.py
@@ -34,7 +34,8 @@ import unittest
sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
-from helper import adjust_filename, TimedQApplication
+from helper.helper import adjust_filename
+from helper.timedqapplication import TimedQApplication
from PySide2.QtCore import QUrl, QObject, Property, Slot
from PySide2.QtQml import QtQml
diff --git a/sources/pyside2/tests/QtQml/registertype.py b/sources/pyside2/tests/QtQml/registertype.py
index 32d93830e..be15b87e8 100644
--- a/sources/pyside2/tests/QtQml/registertype.py
+++ b/sources/pyside2/tests/QtQml/registertype.py
@@ -32,7 +32,7 @@ import unittest
sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
-import helper
+from helper.helper import adjust_filename
from PySide2.QtCore import Property, QTimer, QUrl
from PySide2.QtGui import QGuiApplication, QPen, QColor, QPainter
@@ -110,7 +110,7 @@ class TestQmlSupport(unittest.TestCase):
qmlRegisterType(PieSlice, "Charts", 1, 0, "PieSlice");
view = QQuickView()
- view.setSource(QUrl.fromLocalFile(helper.adjust_filename('registertype.qml', __file__)))
+ view.setSource(QUrl.fromLocalFile(adjust_filename('registertype.qml', __file__)))
view.show()
QTimer.singleShot(250, view.close)
app.exec_()
diff --git a/sources/pyside2/tests/QtQml/signal_arguments.py b/sources/pyside2/tests/QtQml/signal_arguments.py
index d527e72e1..d46a34fcb 100644
--- a/sources/pyside2/tests/QtQml/signal_arguments.py
+++ b/sources/pyside2/tests/QtQml/signal_arguments.py
@@ -32,7 +32,9 @@ import unittest
sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
-from helper import adjust_filename, TimedQApplication
+from helper.helper import adjust_filename
+from helper.timedqapplication import TimedQApplication
+
from PySide2.QtQuick import QQuickView
from PySide2.QtCore import QObject, Signal, Slot, QUrl, QTimer, Property