diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-19 13:27:34 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-19 13:27:34 +0100 |
| commit | 1e204ff6e91227de3bd2f105a1efbaf47ee2b5aa (patch) | |
| tree | 1609ebd46902d5c568d3df08e593ff2b5919cbbc /tests/auto/quick/shared/util.h | |
| parent | 18b0081aeda8fcd5c2d756c47bdd63cb7f89e891 (diff) | |
| parent | 8b048ef2ba4e8414f4852f791964878a6dc3f00f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Blacklisted one test requiring an update of qt5.git.
Conflicts:
.qmake.conf
Change-Id: I75e55a1c5f8840cde55ddb60d632287b2affadeb
Diffstat (limited to 'tests/auto/quick/shared/util.h')
| -rw-r--r-- | tests/auto/quick/shared/util.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tests/auto/quick/shared/util.h b/tests/auto/quick/shared/util.h index fbce8bfa7..b7b7b1564 100644 --- a/tests/auto/quick/shared/util.h +++ b/tests/auto/quick/shared/util.h @@ -168,11 +168,19 @@ inline QString activeElementId(QQuickWebEngineView *webEngineView) return arguments.at(1).toString(); } -#define W_QTEST_MAIN(TestObject) \ +#define W_QTEST_MAIN(TestObject, params) \ int main(int argc, char *argv[]) \ { \ QtWebEngine::initialize(); \ - QGuiApplication app(argc, argv); \ + \ + QVector<const char *> w_argv(argc); \ + for (int i = 0; i < argc; ++i) \ + w_argv[i] = argv[i]; \ + for (int i = 0; i < params.size(); ++i) \ + w_argv.append(params[i].data()); \ + int w_argc = w_argv.size(); \ + \ + QGuiApplication app(w_argc, const_cast<char **>(w_argv.data())); \ app.setAttribute(Qt::AA_Use96Dpi, true); \ TestObject tc; \ QTEST_SET_MAIN_SOURCE_PATH \ |