diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-08-12 09:41:40 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-08-18 12:10:55 +0200 |
| commit | 09222ab2cd57d2412ce6cbf9b32a6b1d88cd719a (patch) | |
| tree | 2e58e0538452187ed7f1d06e3800e1e85bda567e /tests/auto/quick/qmltests/tst_qmltests.cpp | |
| parent | 7b6f30c13717654ec3b95e67edde88a03da45e22 (diff) | |
Check for ssl when compling qml tests
Do not include certificate error qml test if no ssl.
This change does some copy-paste but this will
be handled in qt6.
Change-Id: I8cc6d37074d78ca9f55333f479fb410ef927385d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests/auto/quick/qmltests/tst_qmltests.cpp')
| -rw-r--r-- | tests/auto/quick/qmltests/tst_qmltests.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp index 0d830931d..819f0b07c 100644 --- a/tests/auto/quick/qmltests/tst_qmltests.cpp +++ b/tests/auto/quick/qmltests/tst_qmltests.cpp @@ -26,8 +26,6 @@ ** ****************************************************************************/ -#include <httpsserver.h> - #include <QtCore/QScopedPointer> #include <QTemporaryDir> #include <QtQuickTest/quicktest.h> @@ -145,9 +143,6 @@ int main(int argc, char **argv) qmlRegisterType<TempDir>("Test.util", 1, 0, "TempDir"); QTEST_SET_MAIN_SOURCE_PATH - - qmlRegisterSingletonType<HttpsServer>("Test.Shared", 1, 0, "HttpsServer", [&] (QQmlEngine *, QJSEngine *) { return new HttpsServer; }); - int i = quick_test_main(argc, argv, "qmltests", QUICK_TEST_SOURCE_DIR); return i; } |