From f096fb75c20b82e89e74bb48b7e82fcdfe3f06de Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Fri, 26 Mar 2010 12:22:01 +1000
Subject: Add autotest for QTBUG-9367.

---
 tests/auto/declarative/qdeclarativeecmascript/data/regExp.qml |  7 +++++++
 tests/auto/declarative/qdeclarativeecmascript/testtypes.h     |  5 +++++
 .../qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp     | 11 +++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/regExp.qml

diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/regExp.qml b/tests/auto/declarative/qdeclarativeecmascript/data/regExp.qml
new file mode 100644
index 0000000..0dc404b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/regExp.qml
@@ -0,0 +1,7 @@
+import Qt.test 1.0
+
+MyQmlObject{
+    id: obj
+    objectName: "obj"
+    regExp: /[a-zA-z]/
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
index 72dc3bb..faad8b7 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
+++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
@@ -90,6 +90,7 @@ class MyQmlObject : public QObject
     Q_PROPERTY(QObject *objectProperty READ objectProperty WRITE setObjectProperty NOTIFY objectChanged)
     Q_PROPERTY(QDeclarativeListProperty<QObject> objectListProperty READ objectListProperty CONSTANT)
     Q_PROPERTY(int resettableProperty READ resettableProperty WRITE setResettableProperty RESET resetProperty)
+    Q_PROPERTY(QRegExp regExp READ regExp WRITE setRegExp)
 
 public:
     MyQmlObject(): m_methodCalled(false), m_methodIntCalled(false), m_object(0), m_value(0), m_resetProperty(13) {}
@@ -138,6 +139,9 @@ public:
     void setResettableProperty(int v) { m_resetProperty = v; }
     void resetProperty() { m_resetProperty = 13; }
 
+    QRegExp regExp() { return m_regExp; }
+    void setRegExp(const QRegExp &regExp) { m_regExp = regExp; }
+
 signals:
     void basicSignal();
     void argumentSignal(int a, QString b, qreal c);
@@ -162,6 +166,7 @@ private:
     QList<QObject *> m_objectQList;
     int m_value;
     int m_resetProperty;
+    QRegExp m_regExp;
 };
 
 QML_DECLARE_TYPEINFO(MyQmlObject, QML_HAS_ATTACHED_PROPERTIES)
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 87d73a0..041fd4d 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -131,6 +131,7 @@ private slots:
 
     void bug1();
     void dynamicCreationCrash();
+    void regExpBug();
 
     void callQtInvokables();
 private:
@@ -1241,6 +1242,16 @@ void tst_qdeclarativeecmascript::dynamicCreationCrash()
     QVERIFY(created == 0);
 }
 
+//QTBUG-9367
+void tst_qdeclarativeecmascript::regExpBug()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("regExp.qml"));
+    MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
+    QVERIFY(object != 0);
+    QEXPECT_FAIL("", "QTBUG-9367", Continue);
+    QCOMPARE(object->regExp().pattern(), QLatin1String("[a-zA-z]"));
+}
+
 void tst_qdeclarativeecmascript::callQtInvokables()
 {
     MyInvokableObject o;
-- 
cgit v0.12