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>

diff --git a/src/declarative/scenegraph/util/qsgflatcolormaterial.h b/src/declarative/scenegraph/util/qsgflatcolormaterial.h
index bb2a65b..ffff794 100644 (file)
--- 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 1d825fb..6b1fa85 100644 (file)
--- 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;