diff options
author | Eike Ziller <eike.ziller@qt.io> | 2019-05-08 12:41:25 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2019-05-08 12:41:25 +0200 |
commit | 4545c81e570c477ae8821531dcfd593e09f950b0 (patch) | |
tree | f756738ffaf55210a2aa1596407eeed94e504ae7 /tests/auto/qml/qmldesigner/coretests/tst_testcore.h | |
parent | d0839bc1de52acd0902364565b6f9d030e591646 (diff) | |
parent | 75e408584ac9a60c3a4dd714f5620814485fcdca (diff) |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
doc/src/howto/creator-sidebar-views.qdoc
doc/src/howto/creator-ui.qdoc
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/autotest/testresultmodel.cpp
src/plugins/autotest/testresultmodel.h
Change-Id: I24cc585ca7782cb1d9cb0b8b73b46892b41937fd
Diffstat (limited to 'tests/auto/qml/qmldesigner/coretests/tst_testcore.h')
-rw-r--r-- | tests/auto/qml/qmldesigner/coretests/tst_testcore.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.h b/tests/auto/qml/qmldesigner/coretests/tst_testcore.h index cde63a12d1..3f1eec576b 100644 --- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.h +++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.h @@ -62,6 +62,7 @@ private slots: void testQtQuick20BasicRectangle(); void testQtQuickControls2(); void testImplicitComponents(); + void testRevisionedProperties(); // // unit tests Model, ModelNode, NodeProperty, AbstractView |