diff options
| -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; |