8823bb8d30
Conflicts: examples/opengl/doc/src/cube.qdoc src/corelib/global/qlibraryinfo.cpp src/corelib/text/qbytearray_p.h src/corelib/text/qlocale_data_p.h src/corelib/time/qhijricalendar_data_p.h src/corelib/time/qjalalicalendar_data_p.h src/corelib/time/qromancalendar_data_p.h src/network/ssl/qsslcertificate.h src/widgets/doc/src/graphicsview.qdoc src/widgets/widgets/qcombobox.cpp src/widgets/widgets/qcombobox.h tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro tests/manual/diaglib/debugproxystyle.cpp tests/manual/diaglib/qwidgetdump.cpp tests/manual/diaglib/qwindowdump.cpp tests/manual/diaglib/textdump.cpp util/locale_database/cldr2qlocalexml.py util/locale_database/qlocalexml.py util/locale_database/qlocalexml2cpp.py Resolution of util/locale_database/ are based on: https://codereview.qt-project.org/c/qt/qtbase/+/294250 and src/corelib/{text,time}/*_data_p.h were then regenerated by running those scripts. Updated CMakeLists.txt in each of tests/auto/corelib/serialization/qcborstreamreader/ tests/auto/corelib/serialization/qcborvalue/ tests/auto/gui/kernel/ and generated new ones in each of tests/auto/gui/kernel/qaddpostroutine/ tests/auto/gui/kernel/qhighdpiscaling/ tests/libfuzzer/corelib/text/qregularexpression/optimize/ tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/ tests/libfuzzer/gui/text/qtextdocument/sethtml/ tests/libfuzzer/gui/text/qtextdocument/setmarkdown/ tests/libfuzzer/gui/text/qtextlayout/beginlayout/ by running util/cmake/pro2cmake.py on their changed .pro files. Changed target name in tests/auto/gui/kernel/qaction/qaction.pro tests/auto/gui/kernel/qaction/qactiongroup.pro tests/auto/gui/kernel/qshortcut/qshortcut.pro to ensure unique target names for CMake Changed tst_QComboBox::currentIndex to not test the currentIndexChanged(QString), as that one does not exist in Qt 6 anymore. Change-Id: I9a85705484855ae1dc874a81f49d27a50b0dcff7
50 lines
1.3 KiB
CMake
50 lines
1.3 KiB
CMake
# Generated from kernel.pro.
|
|
|
|
if(QT_FEATURE_action)
|
|
add_subdirectory(qaction)
|
|
add_subdirectory(qactiongroup)
|
|
endif()
|
|
add_subdirectory(qbackingstore)
|
|
add_subdirectory(qcursor)
|
|
add_subdirectory(qdrag)
|
|
add_subdirectory(qevent)
|
|
add_subdirectory(qfileopenevent)
|
|
add_subdirectory(qguieventdispatcher)
|
|
add_subdirectory(qguitimer)
|
|
add_subdirectory(qinputmethod)
|
|
add_subdirectory(qkeyevent)
|
|
add_subdirectory(qmouseevent)
|
|
add_subdirectory(qpalette)
|
|
add_subdirectory(qscreen)
|
|
add_subdirectory(qsurfaceformat)
|
|
add_subdirectory(qwindow)
|
|
add_subdirectory(qguiapplication)
|
|
add_subdirectory(qpixelformat)
|
|
add_subdirectory(qrasterwindow)
|
|
add_subdirectory(qaddpostroutine)
|
|
if(NOT ANDROID AND NOT UIKIT)
|
|
add_subdirectory(qclipboard)
|
|
endif()
|
|
if(TARGET Qt::Network)
|
|
add_subdirectory(qguieventloop)
|
|
endif()
|
|
if(QT_FEATURE_shortcut)
|
|
add_subdirectory(qguimetatype)
|
|
add_subdirectory(qguivariant)
|
|
add_subdirectory(qkeysequence)
|
|
add_subdirectory(qshortcut)
|
|
endif()
|
|
if(QT_FEATURE_highdpiscaling)
|
|
add_subdirectory(qhighdpiscaling)
|
|
endif()
|
|
if(TARGET Qt::Widgets)
|
|
add_subdirectory(qmouseevent_modal)
|
|
add_subdirectory(qtouchevent)
|
|
endif()
|
|
if(QT_FEATURE_opengl)
|
|
add_subdirectory(qopenglwindow)
|
|
endif()
|
|
if(TARGET Qt::Network AND WIN32 AND NOT WINRT)
|
|
add_subdirectory(noqteventloop)
|
|
endif()
|