diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-09-27 20:38:57 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-09-27 20:38:57 +0200 |
| commit | 6faede0860db6fad0645dc36ea817df0b95b7cbc (patch) | |
| tree | da52693f995479bf0b0f8cf25fd4cf4da3c0f857 /src/plugins/qmljstools | |
| parent | a299252ae5938e33b797e4b6e5014465709584bf (diff) | |
| parent | 14a2ff598aec6af17299580468e75a95055c8894 (diff) | |
| download | qt-creator-6faede0860db6fad0645dc36ea817df0b95b7cbc.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
src/plugins/git/gitsettings.cpp
tests/manual/ssh/remoteprocess/remoteprocesstest.h
Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
Diffstat (limited to 'src/plugins/qmljstools')
| -rw-r--r-- | src/plugins/qmljstools/qmljstools_test.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/plugins/qmljstools/qmljstools_test.cpp b/src/plugins/qmljstools/qmljstools_test.cpp index 80fecfca6c..430638771b 100644 --- a/src/plugins/qmljstools/qmljstools_test.cpp +++ b/src/plugins/qmljstools/qmljstools_test.cpp @@ -80,10 +80,6 @@ void QmlJSTools::Internal::QmlJSToolsPlugin::test_basic() QVERIFY(ovItem); QCOMPARE(ovItem->className(), QString("Item")); QCOMPARE(context->imports(doc.data())->info("Item", context.data()).name(), QString("QtQuick")); - const ObjectValue *ovTabWidget = context->lookupType(doc.data(), QStringList() << "TabWidget"); - QVERIFY(ovTabWidget); - QCOMPARE(ovTabWidget->className(), QString("TabWidget")); - QCOMPARE(ovTabWidget->prototype(context)->className(), QString("Item")); const ObjectValue *ovProperty = context->lookupType(doc.data(), QStringList() << "Item" << "states"); QVERIFY(ovProperty); |