diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 176711ef90b..e8e0ee95996 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -51,14 +51,15 @@ qt_internal_add_module(Core global/qendian.cpp global/qendian.h global/qendian_p.h global/qflags.h global/qfloat16.cpp global/qfloat16.h - global/qglobal.cpp global/qglobal.h + global/qforeach.h + global/qglobal.cpp global/qglobal.h global/qglobal_p.h global/qglobalstatic.h global/qhooks.cpp global/qhooks_p.h global/qlibraryinfo.cpp global/qlibraryinfo.h global/qlibraryinfo_p.h - global/qlogging.cpp global/qlogging.h + global/qlogging.cpp global/qlogging.h global/qlogging_p.h global/qmalloc.cpp global/qnamespace.h # this header is specified on purpose so AUTOMOC processes it - global/qnativeinterface.h + global/qnativeinterface.h global/qnativeinterface_p.h global/qnumeric.cpp global/qnumeric.h global/qnumeric_p.h global/qoperatingsystemversion.cpp global/qoperatingsystemversion.h global/qoperatingsystemversion_p.h global/qprocessordetection.h @@ -66,6 +67,7 @@ qt_internal_add_module(Core global/qsysinfo.h global/qsystemdetection.h global/qtnamespacemacros.h + global/qtrace_p.h global/qtypeinfo.h global/qvolatile_p.h global/q20algorithm.h @@ -77,7 +79,7 @@ qt_internal_add_module(Core io/qdebug.cpp io/qdebug.h io/qdebug_p.h io/qdir.cpp io/qdir.h io/qdir_p.h io/qdiriterator.cpp io/qdiriterator.h - io/qfile.cpp io/qfile.h + io/qfile.cpp io/qfile.h io/qfile_p.h io/qfiledevice.cpp io/qfiledevice.h io/qfiledevice_p.h io/qfileinfo.cpp io/qfileinfo.h io/qfileinfo_p.h io/qfileselector.cpp io/qfileselector.h io/qfileselector_p.h @@ -94,9 +96,9 @@ qt_internal_add_module(Core io/qloggingcategory.cpp io/qloggingcategory.h io/qloggingregistry.cpp io/qloggingregistry_p.h io/qnoncontiguousbytedevice.cpp io/qnoncontiguousbytedevice_p.h - io/qresource.cpp io/qresource_p.h + io/qresource.cpp io/qresource.h io/qresource_p.h io/qresource_iterator.cpp io/qresource_iterator_p.h - io/qsavefile.cpp io/qsavefile.h + io/qsavefile.cpp io/qsavefile.h io/qsavefile_p.h io/qstandardpaths.cpp io/qstandardpaths.h io/qstorageinfo.cpp io/qstorageinfo.h io/qstorageinfo_p.h io/qtemporarydir.cpp io/qtemporarydir.h @@ -118,7 +120,7 @@ qt_internal_add_module(Core kernel/qcoreglobaldata.cpp kernel/qcoreglobaldata_p.h kernel/qdeadlinetimer.cpp kernel/qdeadlinetimer.h kernel/qdeadlinetimer_p.h kernel/qelapsedtimer.cpp kernel/qelapsedtimer.h - kernel/qeventloop.cpp kernel/qeventloop.h + kernel/qeventloop.cpp kernel/qeventloop.h kernel/qeventloop_p.h kernel/qfunctions_p.h kernel/qiterable.cpp kernel/qiterable.h kernel/qiterable_p.h kernel/qmath.cpp kernel/qmath.h @@ -128,6 +130,7 @@ qt_internal_add_module(Core kernel/qmetaobjectbuilder.cpp kernel/qmetaobjectbuilder_p.h kernel/qmetatype.cpp kernel/qmetatype.h kernel/qmetatype_p.h kernel/qmimedata.cpp kernel/qmimedata.h + kernel/qtmetamacros.h kernel/qobject.cpp kernel/qobject.h kernel/qobject_p.h kernel/qobject_impl.h kernel/qobjectcleanuphandler.cpp kernel/qobjectcleanuphandler.h @@ -207,6 +210,7 @@ qt_internal_add_module(Core thread/qrunnable.cpp thread/qrunnable.h thread/qthread.cpp thread/qthread.h thread/qthreadstorage.h + thread/qtsan_impl.h thread/qwaitcondition.h thread/qwaitcondition_p.h time/qcalendar.cpp time/qcalendar.h time/qcalendarbackend_p.h @@ -488,6 +492,7 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_thread AND WIN32 qt_internal_extend_target(Core CONDITION WIN32 SOURCES global/qoperatingsystemversion_win.cpp global/qoperatingsystemversion_win_p.h + global/qt_windows.h io/qfilesystemengine_win.cpp io/qfsfileengine_win.cpp io/qlockfile_win.cpp diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt index 5e4ee48ee74..24748fb508c 100644 --- a/src/dbus/CMakeLists.txt +++ b/src/dbus/CMakeLists.txt @@ -24,8 +24,8 @@ qt_internal_add_module(DBus qdbusintrospection.cpp qdbusintrospection_p.h qdbusmarshaller.cpp qdbusmessage.cpp qdbusmessage.h qdbusmessage_p.h - qdbusmetaobject.cpp - qdbusmetatype.cpp qdbusmetatype.h + qdbusmetaobject.cpp qdbusmetaobject_p.h + qdbusmetatype.cpp qdbusmetatype.h qdbusmetatype_p.h qdbusmisc.cpp qdbuspendingcall.cpp qdbuspendingcall.h qdbuspendingcall_p.h qdbuspendingreply.cpp qdbuspendingreply.h diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index b1795842f43..d5d35975b30 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -169,7 +169,8 @@ qt_internal_add_module(Gui painting/qfixed_p.h painting/qgrayraster.c painting/qgrayraster_p.h painting/qicc.cpp painting/qicc_p.h - painting/qimagescale.cpp + painting/qimagescale.cpp painting/qimagescale_p.h + painting/qmath_p.h painting/qmemrotate.cpp painting/qmemrotate_p.h painting/qoutlinemapper.cpp painting/qoutlinemapper_p.h painting/qpagedpaintdevice.cpp painting/qpagedpaintdevice.h painting/qpagedpaintdevice_p.h @@ -187,7 +188,7 @@ qt_internal_add_module(Gui painting/qpathsimplifier.cpp painting/qpathsimplifier_p.h painting/qpdf.cpp painting/qpdf_p.h painting/qpdfwriter.cpp painting/qpdfwriter.h - painting/qpen.cpp painting/qpen.h + painting/qpen.cpp painting/qpen.h painting/qpen_p.h painting/qpixellayout.cpp painting/qpixellayout_p.h painting/qplatformbackingstore.cpp painting/qplatformbackingstore.h painting/qpolygon.cpp painting/qpolygon.h @@ -349,6 +350,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_opengl kernel/qopenglcontext_platform.h kernel/qplatformopenglcontext.cpp kernel/qplatformopenglcontext.h opengl/qopengl.cpp opengl/qopengl.h opengl/qopengl_p.h + opengl/qopenglext.h opengl/qopenglextensions_p.h opengl/qopenglextrafunctions.h opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h @@ -401,8 +403,10 @@ qt_internal_extend_target(Gui CONDITION WIN32 platform/windows/qwindowsguieventdispatcher.cpp platform/windows/qwindowsguieventdispatcher_p.h platform/windows/qwindowsmime_p.h platform/windows/qwindowsnativeinterface.cpp + rhi/cs_tdr_p.h rhi/qrhid3d11.cpp rhi/qrhid3d11_p.h rhi/qrhid3d11_p_p.h + rhi/vs_test_p.h text/windows/qwindowsfontdatabase.cpp text/windows/qwindowsfontdatabase_p.h text/windows/qwindowsfontdatabasebase.cpp text/windows/qwindowsfontdatabasebase_p.h text/windows/qwindowsfontengine.cpp text/windows/qwindowsfontengine_p.h @@ -719,7 +723,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_textmarkdownwriter qt_internal_extend_target(Gui CONDITION QT_FEATURE_cssparser SOURCES - painting/qcssutil.cpp + painting/qcssutil.cpp painting/qcssutil_p.h text/qcssparser.cpp text/qcssparser_p.h ) @@ -833,6 +837,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_undogroup qt_internal_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 SOURCES + opengl/qopengles2ext.h opengl/platform/unix/qglxconvenience.cpp opengl/platform/unix/qglxconvenience_p.h LIBRARIES X11::X11 @@ -876,6 +881,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_vulkan SOURCES rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h rhi/qrhivulkan_p_p.h + rhi/qrhivulkanext_p.h vulkan/qbasicvulkanplatforminstance.cpp vulkan/qbasicvulkanplatforminstance_p.h vulkan/qplatformvulkaninstance.cpp vulkan/qplatformvulkaninstance.h vulkan/qvulkandefaultinstance.cpp vulkan/qvulkandefaultinstance_p.h @@ -1044,7 +1050,7 @@ qt_internal_extend_target(Gui CONDITION IOS OR MACOS qt_internal_extend_target(Gui # special case CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5 # source subtraction gone wrong SOURCES - painting/qdrawhelper.cpp + painting/qdrawhelper.cpp painting/qdrawhelper_neon_p.h NO_PCH_SOURCES "painting/qdrawhelper.cpp" ) diff --git a/src/gui/platform/unix/qgenericunixeventdispatcher.cpp b/src/gui/platform/unix/qgenericunixeventdispatcher.cpp index 2e1d81a181f..df8ddfaf2f4 100644 --- a/src/gui/platform/unix/qgenericunixeventdispatcher.cpp +++ b/src/gui/platform/unix/qgenericunixeventdispatcher.cpp @@ -39,8 +39,9 @@ #include "qgenericunixeventdispatcher_p.h" #include "qunixeventdispatcher_qpa_p.h" -#include "qeventdispatcher_glib_p.h" - +#if QT_CONFIG(glib) +# include "qeventdispatcher_glib_p.h" +#endif QT_BEGIN_NAMESPACE class QAbstractEventDispatcher *QtGenericUnixDispatcher::createUnixEventDispatcher() diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt index f9eb5e36a39..11dc6db158f 100644 --- a/src/opengl/CMakeLists.txt +++ b/src/opengl/CMakeLists.txt @@ -28,7 +28,7 @@ qt_internal_add_module(OpenGL qopenglversionfunctions.cpp qopenglversionfunctions.h qopenglversionfunctions_p.h qopenglversionfunctionsfactory.cpp qopenglversionfunctionsfactory.h qopenglversionprofile.cpp qopenglversionprofile.h - qopenglvertexarrayobject.cpp qopenglvertexarrayobject.h + qopenglvertexarrayobject.cpp qopenglvertexarrayobject.h qopenglvertexarrayobject_p.h qopenglwindow.cpp qopenglwindow.h qtopenglglobal.h DEFINES diff --git a/src/openglwidgets/CMakeLists.txt b/src/openglwidgets/CMakeLists.txt index ec88e322622..bf3c9889197 100644 --- a/src/openglwidgets/CMakeLists.txt +++ b/src/openglwidgets/CMakeLists.txt @@ -7,6 +7,7 @@ qt_internal_add_module(OpenGLWidgets SOURCES qopenglwidget.cpp qopenglwidget.h + qtopenglwidgetsglobal.h DEFINES QT_NO_FOREACH QT_NO_USING_NAMESPACE diff --git a/src/platformsupport/input/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt index 51bbce4a632..3ad593e17ff 100644 --- a/src/platformsupport/input/CMakeLists.txt +++ b/src/platformsupport/input/CMakeLists.txt @@ -37,6 +37,7 @@ qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_evdev evdevmouse/qevdevmousehandler.cpp evdevmouse/qevdevmousehandler_p.h evdevmouse/qevdevmousemanager.cpp evdevmouse/qevdevmousemanager_p.h evdevtouch/qevdevtouchhandler.cpp evdevtouch/qevdevtouchhandler_p.h + evdevtouch/qevdevtouchfilter_p.h evdevtouch/qevdevtouchmanager.cpp evdevtouch/qevdevtouchmanager_p.h INCLUDE_DIRECTORIES evdevtouch/../shared diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt index 676631649d4..941b790d0c8 100644 --- a/src/printsupport/CMakeLists.txt +++ b/src/printsupport/CMakeLists.txt @@ -14,7 +14,7 @@ qt_internal_add_module(PrintSupport kernel/qprint_p.h kernel/qprintdevice.cpp kernel/qprintdevice_p.h kernel/qprintengine.h - kernel/qprintengine_pdf.cpp + kernel/qprintengine_pdf.cpp kernel/qprintengine_pdf_p.h kernel/qprinter.cpp kernel/qprinter.h kernel/qprinter_p.h kernel/qprinterinfo.cpp kernel/qprinterinfo.h kernel/qprinterinfo_p.h kernel/qtprintsupportglobal.h kernel/qtprintsupportglobal_p.h diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt index 2b7aaad4da0..f8e78bf6aba 100644 --- a/src/testlib/CMakeLists.txt +++ b/src/testlib/CMakeLists.txt @@ -13,6 +13,7 @@ qt_internal_add_module(Test QMAKE_MODULE_CONFIG console testlib_defines EXCEPTIONS SOURCES + 3rdparty/cycle_p.h qabstracttestlogger.cpp qabstracttestlogger_p.h qasciikey.cpp qbenchmark.cpp qbenchmark.h qbenchmark_p.h @@ -88,6 +89,8 @@ qt_internal_extend_target(Test CONDITION QT_FEATURE_itemmodeltester qt_internal_extend_target(Test CONDITION QT_FEATURE_valgrind SOURCES + 3rdparty/callgrind_p.h + 3rdparty/valgrind_p.h qbenchmarkvalgrind.cpp qbenchmarkvalgrind_p.h ) diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index f2bb1e58a18..13b31c6728d 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -35,7 +35,7 @@ qt_internal_add_module(Widgets styles/qpixmapstyle.cpp styles/qpixmapstyle_p.h styles/qpixmapstyle_p_p.h styles/qproxystyle.cpp styles/qproxystyle.h styles/qproxystyle_p.h - styles/qstyle.cpp styles/qstyle.h + styles/qstyle.cpp styles/qstyle.h styles/qstyle_p.h styles/qstylefactory.cpp styles/qstylefactory.h styles/qstylehelper.cpp styles/qstylehelper_p.h styles/qstyleoption.cpp styles/qstyleoption.h @@ -760,6 +760,7 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_treewidget SOURCES itemviews/qtreewidget.cpp itemviews/qtreewidget.h itemviews/qtreewidget_p.h itemviews/qtreewidgetitemiterator.cpp itemviews/qtreewidgetitemiterator.h + itemviews/qtreewidgetitemiterator_p.h ) qt_internal_extend_target(Widgets CONDITION QT_FEATURE_graphicsview