diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-18 10:25:38 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-19 02:32:53 +0200 |
| commit | 08e37a16c202364b0b919653f3a17979388cac27 (patch) | |
| tree | 0c7230e0cb5cf4110565471fca4bf148c2a74355 | |
| parent | eaf52673ef38b4d7a14f9fb9f258d8f1c6097401 (diff) | |
Don't skip autotest and export needed symbol
Change-Id: Ib5090348cefa955caa54c5e4fff8cb961ddb8e52
Reviewed-on: http://codereview.qt.nokia.com/3147
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| -rw-r--r-- | src/declarative/scenegraph/util/qsgflatcolormaterial.h | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/nodes/tst_nodestest.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/declarative/scenegraph/util/qsgflatcolormaterial.h b/src/declarative/scenegraph/util/qsgflatcolormaterial.h index bb2a65bedf..ffff7941a3 100644 --- a/src/declarative/scenegraph/util/qsgflatcolormaterial.h +++ b/src/declarative/scenegraph/util/qsgflatcolormaterial.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_AUTOTEST_EXPORT QSGFlatColorMaterial : public QSGMaterial +class Q_DECLARATIVE_EXPORT QSGFlatColorMaterial : public QSGMaterial { public: QSGFlatColorMaterial(); diff --git a/tests/auto/declarative/nodes/tst_nodestest.cpp b/tests/auto/declarative/nodes/tst_nodestest.cpp index 1d825fbd34..6b1fa85a4a 100644 --- a/tests/auto/declarative/nodes/tst_nodestest.cpp +++ b/tests/auto/declarative/nodes/tst_nodestest.cpp @@ -220,8 +220,6 @@ void NodesTest::simulatedEffect_data() void NodesTest::simulatedEffect() { - QSKIP("QTBUG-20029", SkipAll); - QFETCH(bool, connected); QSGRootNode root; |