diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-03-11 11:32:50 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-13 14:30:58 +0100 |
| commit | cc71b9636beb504dc5e11ca3114a45d8400bf5f0 (patch) | |
| tree | 49d902bc75f2cbbd722bf4e770c97fc229566f90 | |
| parent | 3a1ec49de2217069f11ed153efcd128c628d3f4a (diff) | |
Fix qdeclarativelanguage test for installed builds.
Compile failure due to auto-test-exported symbol
qmlRegisterTypeNotAvailable().
Change-Id: Ia1ae312f1d7f8d3fcd93879780d01f7a8b1e0383
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| -rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/testtypes.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp b/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp index ee01235b..f812110d 100644 --- a/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp +++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp @@ -69,7 +69,9 @@ void registerTypes() qmlRegisterCustomType<MyCustomParserType>("Test", 1, 0, "MyCustomParserType", new MyCustomParserTypeParser); +#ifdef QT_BUILD_INTERNAL qmlRegisterTypeNotAvailable("Test",1,0,"UnavailableType", "UnavailableType is unavailable for testing"); +#endif } QVariant myCustomVariantTypeConverter(const QString &data) diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp index e43ca9dd..1574aa4a 100644 --- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp +++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp @@ -405,7 +405,9 @@ void tst_qdeclarativelanguage::errors_data() QTest::newRow("invalidOn") << "invalidOn.qml" << "invalidOn.errors.txt" << false; QTest::newRow("invalidProperty") << "invalidProperty.qml" << "invalidProperty.errors.txt" << false; QTest::newRow("nonScriptableProperty") << "nonScriptableProperty.qml" << "nonScriptableProperty.errors.txt" << false; +#ifdef QT_BUILD_INTERNAL QTest::newRow("notAvailable") << "notAvailable.qml" << "notAvailable.errors.txt" << false; +#endif QTest::newRow("singularProperty") << "singularProperty.qml" << "singularProperty.errors.txt" << false; QTest::newRow("singularProperty.2") << "singularProperty.2.qml" << "singularProperty.2.errors.txt" << false; QTest::newRow("incorrectCase") << "incorrectCase.qml" |