diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-02-13 09:14:09 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-13 18:31:40 +0100 |
| commit | 6b2535ea15cdbdb2355416b604f072fc13ff36b2 (patch) | |
| tree | 4bf1560bab77c8b315850c5337ba31a0ea87b5f0 /src/testlib/testlib.pro | |
| parent | 54c2cebabdda0280b8443c6947b6fee02445e138 (diff) | |
| parent | 67491e2df5357706dbf88ddaf1f030ff095b4528 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
examples/widgets/graphicsview/boxes/scene.h
src/corelib/Qt5CoreMacros.cmake
src/corelib/Qt6CoreMacros.cmake
src/network/ssl/qsslsocket.cpp
src/network/ssl/qsslsocket.h
src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
src/testlib/CMakeLists.txt
src/testlib/.prev_CMakeLists.txt
tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp
Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.
Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152
Diffstat (limited to 'src/testlib/testlib.pro')
| -rw-r--r-- | src/testlib/testlib.pro | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index 530bc6b425..787df6b648 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -51,10 +51,10 @@ HEADERS = \ qtestblacklist_p.h \ qtesthelpers_p.h \ qttestglobal.h \ - qtestxunitstreamer_p.h \ + qtestjunitstreamer_p.h \ qtaptestlogger_p.h \ qxmltestlogger_p.h \ - qxunittestlogger_p.h + qjunittestlogger_p.h SOURCES = \ qtestcase.cpp \ @@ -77,8 +77,8 @@ SOURCES = \ qtestelement.cpp \ qtestelementattribute.cpp \ qtestmouse.cpp \ - qtestxunitstreamer.cpp \ - qxunittestlogger.cpp \ + qtestjunitstreamer.cpp \ + qjunittestlogger.cpp \ qtestblacklist.cpp \ qtaptestlogger.cpp @@ -112,7 +112,7 @@ mac { macos { HEADERS += qtestutil_macos_p.h OBJECTIVE_SOURCES += qtestutil_macos.mm - LIBS += -framework Foundation -framework ApplicationServices -framework IOKit + LIBS += -framework Foundation -framework ApplicationServices -framework IOKit -framework AppKit } # XCTest support (disabled for now) |