diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-12 20:36:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-12 20:36:48 +0200 |
| commit | 880a143eb572de3e8a6734cc663ed4b6e309b99d (patch) | |
| tree | 4d1ad149dff7d9708e5981ea7b0ec7f8aee24bbf /tests/auto/qml/qqmlmoduleplugin | |
| parent | c433b78660923b6268653b437a2a04078de0f058 (diff) | |
| parent | a6057b46eebc71772d584ea5d318d130e2f40a19 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: I4476733af61fcf3a2af1d121a4585c3fae1c240e
Diffstat (limited to 'tests/auto/qml/qqmlmoduleplugin')
| -rw-r--r-- | tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp index 3148ffb5a5..82aa265465 100644 --- a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp @@ -103,7 +103,7 @@ public: qmlRegisterModule(uri, 1, 0); } - void initializeEngine(QQmlEngine *engine, const char *uri) override + void initializeEngine(QQmlEngine *, const char *) override { initializeEngineEntered.lock(); leavingInitializeEngine.lock(); |