aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PySide/QtDeclarative/typesystem_declarative.xml1
-rw-r--r--tests/QtDeclarative/CMakeLists.txt1
-rw-r--r--tests/QtDeclarative/bug_557.py14
3 files changed, 16 insertions, 0 deletions
diff --git a/PySide/QtDeclarative/typesystem_declarative.xml b/PySide/QtDeclarative/typesystem_declarative.xml
index 05d72e801..5649bf294 100644
--- a/PySide/QtDeclarative/typesystem_declarative.xml
+++ b/PySide/QtDeclarative/typesystem_declarative.xml
@@ -66,6 +66,7 @@
<object-type name="QDeclarativeExtensionInterface"/>
<object-type name="QDeclarativeComponent">
<enum-type name="Status"/>
+ <modify-function signature="QDeclarativeComponent(QObject*)" remove="all" />
</object-type>
<object-type name="QDeclarativeContext">
<modify-function signature="setContextProperty(const QString &amp;, QObject*)">
diff --git a/tests/QtDeclarative/CMakeLists.txt b/tests/QtDeclarative/CMakeLists.txt
index 5cd53e964..84bc4957b 100644
--- a/tests/QtDeclarative/CMakeLists.txt
+++ b/tests/QtDeclarative/CMakeLists.txt
@@ -1,5 +1,6 @@
PYSIDE_TEST(bug_451.py)
PYSIDE_TEST(bug_456.py)
+PYSIDE_TEST(bug_557.py)
PYSIDE_TEST(qdeclarativenetwork_test.py)
PYSIDE_TEST(qdeclarativeview_test.py)
PYSIDE_TEST(connect_python_qml.py)
diff --git a/tests/QtDeclarative/bug_557.py b/tests/QtDeclarative/bug_557.py
new file mode 100644
index 000000000..c78aaf15d
--- /dev/null
+++ b/tests/QtDeclarative/bug_557.py
@@ -0,0 +1,14 @@
+from PySide.QtCore import *
+from PySide.QtGui import *
+from PySide.QtDeclarative import *
+
+import sys
+
+app = QApplication(sys.argv)
+
+engine = QDeclarativeEngine()
+component = QDeclarativeComponent(engine)
+
+# This should segfault if the QDeclarativeComponent has not QDeclarativeEngine
+component.loadUrl(QUrl.fromLocalFile('foo.qml'))
+