diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-01 14:11:00 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-08 11:52:02 +0200 |
| commit | b4d965231e4aa22b625997e8d4271f3c6f872696 (patch) | |
| tree | 6567c6be580a8c2129f3455fa14756128d8e92c6 /tests/auto | |
| parent | 37d19e4b5eda47c145eeeac884d0b558acddb19d (diff) | |
dumpcpp: Use moc to generate metaobject code
dumpcpp contained an old version of moc code, which is now out
of date. Write out the interface as C++ code and run the real
moc on it to generate this. Some modifications are required.
Remove some asserts that checked on an empty meta object
created in the fallback path of QAxBasePrivate::metaObject()
which was removed by
0bcdc74f55574e1a45bef8728bd5093cf1acfc33.
Task-number: QTBUG-82945
Change-Id: Ide58bae1440331ea4d5da0fcc74b41f49f09599a
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/dumpcpp/tst_dumpcpp.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/dumpcpp/tst_dumpcpp.cpp b/tests/auto/dumpcpp/tst_dumpcpp.cpp index cf542f3..039c090 100644 --- a/tests/auto/dumpcpp/tst_dumpcpp.cpp +++ b/tests/auto/dumpcpp/tst_dumpcpp.cpp @@ -41,7 +41,6 @@ private slots: // A simple test to verify that an object can be instantiated and interacted with void tst_dumpcpp::toggleAddressBar() { - QSKIP("Crashes in Qt 6 pending rewrite of dumpcpp for new QMetaObject", Abort); // Qt 6 Fixme SHDocVw::WebBrowser* webBrowser = new SHDocVw::WebBrowser; QVERIFY(webBrowser); bool addressBar = webBrowser->AddressBar(); |