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
29 lines
900 B
Prolog
29 lines
900 B
Prolog
CONFIG += testcase
|
|
|
|
QT += widgets widgets-private testlib
|
|
QT += core-private gui-private
|
|
|
|
SOURCES += ../tst_qapplication.cpp
|
|
|
|
builtin_testdata: DEFINES += BUILTIN_TESTDATA
|
|
|
|
TESTDATA = ../test/test.pro ../tmp/README ../modal
|
|
|
|
!android:!winrt: SUBPROGRAMS = desktopsettingsaware modal
|
|
|
|
debug_and_release {
|
|
CONFIG(debug, debug|release) {
|
|
TARGET = ../../debug/tst_qapplication
|
|
!android:!winrt: TEST_HELPER_INSTALLS = ../debug/helper
|
|
for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../debug/$${file}"
|
|
} else {
|
|
TARGET = ../../release/tst_qapplication
|
|
!android:!winrt: TEST_HELPER_INSTALLS = ../release/helper
|
|
for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../release/$${file}"
|
|
}
|
|
} else {
|
|
TARGET = ../tst_qapplication
|
|
!android:!winrt: TEST_HELPER_INSTALLS = ../helper
|
|
for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../$${file}"
|
|
}
|