e3ed2281c0
Conflicts: src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/cocoa/qnsview_dragging.mm src/plugins/platforms/ios/qiosinputcontext.mm src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/tools/androiddeployqt/main.cpp Was moved from qttools into qtbase in 5.11. So re-apply 32398e4d here. tests/auto/corelib/global/qlogging/test/test.pro tests/auto/corelib/global/qlogging/tst_qlogging.cpp tests/auto/corelib/io/qfile/tst_qfile.cpp tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp tests/auto/corelib/thread/qthreadstorage/test/test.pro tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp tests/auto/widgets/kernel/qapplication/test/test.pro Done-with: Gatis Paeglis <gatis.paeglis@qt.io> Done-with: Mårten Nordheim <marten.nordheim@qt.io> Done-with: Oliver Wolff <oliver.wolff@qt.io> Change-Id: Id970486c5315a1718c540f00deb2633533e8fc7b
22 lines
469 B
Prolog
22 lines
469 B
Prolog
CONFIG += testcase
|
|
SOURCES += ../tst_selftests.cpp
|
|
QT = core testlib-private
|
|
|
|
TARGET = ../tst_selftests
|
|
|
|
win32 {
|
|
CONFIG(debug, debug|release) {
|
|
TARGET = ../../debug/tst_selftests
|
|
} else {
|
|
TARGET = ../../release/tst_selftests
|
|
}
|
|
}
|
|
|
|
expected_files.files = $$files($$PWD/../expected_*)
|
|
expected_files.base = $$PWD/..
|
|
RESOURCES += expected_files
|
|
|
|
include(../selftests.pri)
|
|
!android:!winrt: for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../$${file}/$${file}"
|
|
|