2 files changed, 50 insertions, 0 deletions
diff --git a/tests/auto/qflags/tst_qflags.cpp b/tests/auto/qflags/tst_qflags.cpp
index 87025b6..85e64a6 100644
--- a/tests/auto/qflags/tst_qflags.cpp
+++ b/tests/auto/qflags/tst_qflags.cpp
@@ -47,6 +47,7 @@ private slots:
     void testFlag() const;
     void testFlagZeroFlag() const;
     void testFlagMultiBits() const;
+    void constExpr();
 };
 
 void tst_QFlags::testFlag() const
@@ -96,5 +97,32 @@ void tst_QFlags::testFlagMultiBits() const
     }
 }
 
+template <int N, typename T> bool verifyConstExpr(T n) { return n == N; }
+
+void tst_QFlags::constExpr()
+{
+#ifdef Q_COMPILER_CONSTEXPR
+    Qt::MouseButtons btn = Qt::LeftButton | Qt::RightButton;
+    switch (btn) {
+        case Qt::LeftButton: QVERIFY(false); break;
+        case Qt::RightButton: QVERIFY(false); break;
+        case Qt::LeftButton | Qt::RightButton: QVERIFY(true); break;
+        default: QVERIFY(false);
+    }
+
+    QVERIFY(verifyConstExpr<(Qt::LeftButton | Qt::RightButton) & Qt::LeftButton>(Qt::LeftButton));
+    QVERIFY(verifyConstExpr<(Qt::LeftButton | Qt::RightButton) & Qt::MiddleButton>(0));
+    QVERIFY(verifyConstExpr<(Qt::LeftButton | Qt::RightButton) | Qt::MiddleButton>(Qt::LeftButton | Qt::RightButton | Qt::MiddleButton));
+    QVERIFY(verifyConstExpr<~(Qt::LeftButton | Qt::RightButton)>(~(Qt::LeftButton | Qt::RightButton)));
+    QVERIFY(verifyConstExpr<Qt::MouseButtons(Qt::LeftButton) ^ Qt::RightButton>(Qt::LeftButton ^ Qt::RightButton));
+    QVERIFY(verifyConstExpr<Qt::MouseButtons(0)>(0));
+    QVERIFY(verifyConstExpr<Qt::MouseButtons(Qt::RightButton) & 0xff>(Qt::RightButton));
+    QVERIFY(verifyConstExpr<Qt::MouseButtons(Qt::RightButton) | 0xff>(0xff));
+
+    QVERIFY(!verifyConstExpr<Qt::RightButton>(!Qt::MouseButtons(Qt::LeftButton)));
+#endif
+}
+
+
 QTEST_MAIN(tst_QFlags)
 #include "tst_qflags.moc"
diff --git a/tests/auto/qscopedpointer/tst_qscopedpointer.cpp b/tests/auto/qscopedpointer/tst_qscopedpointer.cpp
index 1a6f944..06c0ecb 100644
--- a/tests/auto/qscopedpointer/tst_qscopedpointer.cpp
+++ b/tests/auto/qscopedpointer/tst_qscopedpointer.cpp
@@ -72,6 +72,7 @@ private Q_SLOTS:
     void isNullSignature();
     void objectSize();
     void comparison();
+    void array();
     // TODO instanciate on const object
 };
 
@@ -437,5 +438,26 @@ void tst_QScopedPointer::comparison()
     QCOMPARE( int(RefCounted::instanceCount), 0 );
 }
 
+void tst_QScopedPointer::array()
+{
+    int instCount = RefCounted::instanceCount;
+    {
+        QScopedArrayPointer<RefCounted> array;
+        array.reset(new RefCounted[42]);
+        QCOMPARE(instCount + 42, int(RefCounted::instanceCount));
+    }
+    QCOMPARE(instCount, int(RefCounted::instanceCount));
+    {
+        QScopedArrayPointer<RefCounted> array(new RefCounted[42]);
+        QCOMPARE(instCount + 42, int(RefCounted::instanceCount));
+        array.reset(new RefCounted[28]);
+        QCOMPARE(instCount + 28, int(RefCounted::instanceCount));
+        array.reset(0);
+        QCOMPARE(instCount, int(RefCounted::instanceCount));
+    }
+    QCOMPARE(instCount, int(RefCounted::instanceCount));
+}
+
+
 QTEST_MAIN(tst_QScopedPointer)
 #include "tst_qscopedpointer.moc"