diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-04-15 17:16:04 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-04-15 17:16:04 +0300 |
| commit | fa4781b6691eff0d9eb2e9c8e536e9c09a23f054 (patch) | |
| tree | 416b3b3d0fdb89d19f951fae4b7ed779c0c32416 /tests/auto/quick | |
| parent | 81047475209d3b78a06ec694f5d2aed9b325fe45 (diff) | |
| parent | 43cd26bfcd78f0b38f286f108ad7a04374695fce (diff) | |
Merge branch 'tqtc/lts-6.2.8' into 6.2.86.2.8
Change-Id: I87024a49104f1fc9b4418f7b7496a4a74de7eaa4
Diffstat (limited to 'tests/auto/quick')
| -rw-r--r-- | tests/auto/quick/inspectorserver/BLACKLIST | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qmltests/tst_qmltests.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/quick/inspectorserver/BLACKLIST b/tests/auto/quick/inspectorserver/BLACKLIST index 076dd5f10..318dae7a5 100644 --- a/tests/auto/quick/inspectorserver/BLACKLIST +++ b/tests/auto/quick/inspectorserver/BLACKLIST @@ -1,2 +1,2 @@ [openRemoteDebuggingSession] -macos +* diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp index 9e928157e..d27ef269d 100644 --- a/tests/auto/quick/qmltests/tst_qmltests.cpp +++ b/tests/auto/quick/qmltests/tst_qmltests.cpp @@ -263,7 +263,7 @@ int main(int argc, char **argv) #if QT_CONFIG(ssl) qmlRegisterSingletonType<HttpsServer>( "Test.Shared", 1, 0, "HttpsServer", [&](QQmlEngine *, QJSEngine *) { - return new HttpsServer(":/resources/server.pem", ":/resources/server.key", ""); + return new HttpsServer(":/resources/server.pem", ":/resources/server.key"); }); #endif Setup setup; |