From ad2da2d27a590333fc89a56fc58700a09c3017b3 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 17 Dec 2020 14:55:57 +0100 Subject: Remove the qmake project files Remove the qmake project files for most of Qt. Leave the qmake project files for examples, because we still test those in the CI to ensure qmake does not regress. Also leave the qmake project files for utils and other minor parts that lack CMake project files. Task-number: QTBUG-88742 Change-Id: I6cdf059e6204816f617f9624f3ea9822703f73cc Reviewed-by: Edward Welbourne Reviewed-by: Qt CI Bot Reviewed-by: Kai Koehne --- src/gui/accessible/accessible.pri | 30 ---- src/gui/accessible/linux/linux.pri | 27 --- .../accessible/windows/apisupport/apisupport.pri | 15 -- src/gui/accessible/windows/windows.pri | 1 - src/gui/animation/animation.pri | 2 - src/gui/configure.pri | 46 ----- src/gui/doc/snippets/brush/brush.pro | 8 - src/gui/doc/snippets/clipboard/clipboard.pro | 10 -- src/gui/doc/snippets/code/code.pro | 48 ------ src/gui/doc/snippets/code/doc_src_qtgui.pro | 3 - src/gui/doc/snippets/draganddrop/draganddrop.pro | 9 - src/gui/doc/snippets/dragging/dragging.pro | 5 - src/gui/doc/snippets/droparea/droparea.pro | 6 - src/gui/doc/snippets/dropevents/dropevents.pro | 6 - .../doc/snippets/droprectangle/droprectangle.pro | 6 - src/gui/doc/snippets/image/image.pro | 8 - src/gui/doc/snippets/picture/picture.pro | 7 - .../snippets/plaintextlayout/plaintextlayout.pro | 6 - src/gui/doc/snippets/polygon/polygon.pro | 7 - .../doc/snippets/qfileopenevent/qfileopenevent.pro | 7 - .../doc/snippets/qfontdatabase/qfontdatabase.pro | 5 - src/gui/doc/snippets/qimagewriter/qimagewriter.pro | 7 - .../snippets/qstatustipevent/qstatustipevent.pro | 7 - src/gui/doc/snippets/qtextobject/qtextobject.pro | 7 - .../snippets/scribe-overview/scribe-overview.pro | 6 - src/gui/doc/snippets/separations/separations.pro | 13 -- src/gui/doc/snippets/snippets.pro | 45 ----- .../textblock-formats/textblock-formats.pro | 6 - .../textblock-fragments/textblock-fragments.pro | 8 - .../textdocument-blocks/textdocument-blocks.pro | 10 -- .../textdocument-charformats.pro | 6 - .../snippets/textdocument-css/textdocument-css.pro | 5 - .../textdocument-cursors/textdocument-cursors.pro | 6 - .../snippets/textdocument-end/textdocument-end.pro | 5 - .../textdocument-find/textdocument-find.pro | 6 - .../textdocument-frames/textdocument-frames.pro | 10 -- .../textdocument-imagedrop.pro | 8 - .../textdocument-imageformat.pro | 9 - .../textdocument-images/textdocument-images.pro | 9 - .../textdocument-listitems.pro | 10 -- .../textdocument-listitemstyles.pro | 10 -- .../textdocument-lists/textdocument-lists.pro | 6 - .../textdocument-printing.pro | 10 -- .../textdocument-resources.pro | 6 - .../textdocument-selections.pro | 10 -- .../textdocument-tables/textdocument-tables.pro | 10 -- .../textdocument-texttable.pro | 6 - src/gui/doc/snippets/transform/transform.pro | 6 - src/gui/gui.pro | 86 ---------- src/gui/image/image.pri | 107 ------------ src/gui/image/qpnghandler.pri | 0 src/gui/itemmodels/itemmodels.pri | 19 -- src/gui/kernel/kernel.pri | 191 --------------------- src/gui/math3d/math3d.pri | 14 -- src/gui/opengl/opengl.pri | 19 -- src/gui/opengl/platform/egl/egl.pri | 32 ---- src/gui/opengl/platform/platform.pri | 4 - src/gui/opengl/platform/unix/unix.pri | 7 - src/gui/painting/painting.pri | 176 ------------------- src/gui/platform/android/android.pri | 1 - src/gui/platform/darwin/darwin.pri | 4 - src/gui/platform/macos/macos.pri | 4 - src/gui/platform/platform.pri | 6 - src/gui/platform/unix/dbusmenu/dbusmenu.pri | 15 -- src/gui/platform/unix/dbustray/dbustray.pri | 11 -- src/gui/platform/unix/unix.pri | 45 ----- src/gui/platform/wasm/wasm.pri | 3 - src/gui/platform/windows/windows.pri | 7 - src/gui/rhi/rhi.pri | 57 ------ src/gui/text/coretext/coretext.pri | 19 -- src/gui/text/freetype/freetype.pri | 9 - src/gui/text/text.pri | 139 --------------- src/gui/text/unix/unix.pri | 13 -- src/gui/text/windows/windows.pri | 35 ---- src/gui/util/util.pri | 64 ------- src/gui/vulkan/vulkan.pri | 63 ------- 76 files changed, 1659 deletions(-) delete mode 100644 src/gui/accessible/accessible.pri delete mode 100644 src/gui/accessible/linux/linux.pri delete mode 100644 src/gui/accessible/windows/apisupport/apisupport.pri delete mode 100644 src/gui/accessible/windows/windows.pri delete mode 100644 src/gui/animation/animation.pri delete mode 100644 src/gui/configure.pri delete mode 100644 src/gui/doc/snippets/brush/brush.pro delete mode 100644 src/gui/doc/snippets/clipboard/clipboard.pro delete mode 100644 src/gui/doc/snippets/code/code.pro delete mode 100644 src/gui/doc/snippets/code/doc_src_qtgui.pro delete mode 100644 src/gui/doc/snippets/draganddrop/draganddrop.pro delete mode 100644 src/gui/doc/snippets/dragging/dragging.pro delete mode 100644 src/gui/doc/snippets/droparea/droparea.pro delete mode 100644 src/gui/doc/snippets/dropevents/dropevents.pro delete mode 100644 src/gui/doc/snippets/droprectangle/droprectangle.pro delete mode 100644 src/gui/doc/snippets/image/image.pro delete mode 100644 src/gui/doc/snippets/picture/picture.pro delete mode 100644 src/gui/doc/snippets/plaintextlayout/plaintextlayout.pro delete mode 100644 src/gui/doc/snippets/polygon/polygon.pro delete mode 100644 src/gui/doc/snippets/qfileopenevent/qfileopenevent.pro delete mode 100644 src/gui/doc/snippets/qfontdatabase/qfontdatabase.pro delete mode 100644 src/gui/doc/snippets/qimagewriter/qimagewriter.pro delete mode 100644 src/gui/doc/snippets/qstatustipevent/qstatustipevent.pro delete mode 100644 src/gui/doc/snippets/qtextobject/qtextobject.pro delete mode 100644 src/gui/doc/snippets/scribe-overview/scribe-overview.pro delete mode 100644 src/gui/doc/snippets/separations/separations.pro delete mode 100644 src/gui/doc/snippets/snippets.pro delete mode 100644 src/gui/doc/snippets/textblock-formats/textblock-formats.pro delete mode 100644 src/gui/doc/snippets/textblock-fragments/textblock-fragments.pro delete mode 100644 src/gui/doc/snippets/textdocument-blocks/textdocument-blocks.pro delete mode 100644 src/gui/doc/snippets/textdocument-charformats/textdocument-charformats.pro delete mode 100644 src/gui/doc/snippets/textdocument-css/textdocument-css.pro delete mode 100644 src/gui/doc/snippets/textdocument-cursors/textdocument-cursors.pro delete mode 100644 src/gui/doc/snippets/textdocument-end/textdocument-end.pro delete mode 100644 src/gui/doc/snippets/textdocument-find/textdocument-find.pro delete mode 100644 src/gui/doc/snippets/textdocument-frames/textdocument-frames.pro delete mode 100644 src/gui/doc/snippets/textdocument-imagedrop/textdocument-imagedrop.pro delete mode 100644 src/gui/doc/snippets/textdocument-imageformat/textdocument-imageformat.pro delete mode 100644 src/gui/doc/snippets/textdocument-images/textdocument-images.pro delete mode 100644 src/gui/doc/snippets/textdocument-listitems/textdocument-listitems.pro delete mode 100644 src/gui/doc/snippets/textdocument-listitemstyles/textdocument-listitemstyles.pro delete mode 100644 src/gui/doc/snippets/textdocument-lists/textdocument-lists.pro delete mode 100644 src/gui/doc/snippets/textdocument-printing/textdocument-printing.pro delete mode 100644 src/gui/doc/snippets/textdocument-resources/textdocument-resources.pro delete mode 100644 src/gui/doc/snippets/textdocument-selections/textdocument-selections.pro delete mode 100644 src/gui/doc/snippets/textdocument-tables/textdocument-tables.pro delete mode 100644 src/gui/doc/snippets/textdocument-texttable/textdocument-texttable.pro delete mode 100644 src/gui/doc/snippets/transform/transform.pro delete mode 100644 src/gui/gui.pro delete mode 100644 src/gui/image/image.pri delete mode 100644 src/gui/image/qpnghandler.pri delete mode 100644 src/gui/itemmodels/itemmodels.pri delete mode 100644 src/gui/kernel/kernel.pri delete mode 100644 src/gui/math3d/math3d.pri delete mode 100644 src/gui/opengl/opengl.pri delete mode 100644 src/gui/opengl/platform/egl/egl.pri delete mode 100644 src/gui/opengl/platform/platform.pri delete mode 100644 src/gui/opengl/platform/unix/unix.pri delete mode 100644 src/gui/painting/painting.pri delete mode 100644 src/gui/platform/android/android.pri delete mode 100644 src/gui/platform/darwin/darwin.pri delete mode 100644 src/gui/platform/macos/macos.pri delete mode 100644 src/gui/platform/platform.pri delete mode 100644 src/gui/platform/unix/dbusmenu/dbusmenu.pri delete mode 100644 src/gui/platform/unix/dbustray/dbustray.pri delete mode 100644 src/gui/platform/unix/unix.pri delete mode 100644 src/gui/platform/wasm/wasm.pri delete mode 100644 src/gui/platform/windows/windows.pri delete mode 100644 src/gui/rhi/rhi.pri delete mode 100644 src/gui/text/coretext/coretext.pri delete mode 100644 src/gui/text/freetype/freetype.pri delete mode 100644 src/gui/text/text.pri delete mode 100644 src/gui/text/unix/unix.pri delete mode 100644 src/gui/text/windows/windows.pri delete mode 100644 src/gui/util/util.pri delete mode 100644 src/gui/vulkan/vulkan.pri (limited to 'src/gui') diff --git a/src/gui/accessible/accessible.pri b/src/gui/accessible/accessible.pri deleted file mode 100644 index cc403ba9e9..0000000000 --- a/src/gui/accessible/accessible.pri +++ /dev/null @@ -1,30 +0,0 @@ -# Qt accessibility module - -qtConfig(accessibility) { - HEADERS += \ - accessible/qaccessible.h \ - accessible/qaccessiblecache_p.h \ - accessible/qaccessibleobject.h \ - accessible/qaccessibleplugin.h \ - accessible/qplatformaccessibility.h \ - accessible/qaccessiblebridge.h \ - accessible/qaccessiblebridgeutils_p.h - - SOURCES += accessible/qaccessible.cpp \ - accessible/qaccessiblecache.cpp \ - accessible/qaccessibleobject.cpp \ - accessible/qaccessibleplugin.cpp \ - accessible/qplatformaccessibility.cpp \ - accessible/qaccessiblebridge.cpp \ - accessible/qaccessiblebridgeutils.cpp - - mac { - OBJECTIVE_SOURCES += accessible/qaccessiblecache_mac.mm - - LIBS_PRIVATE += -framework Foundation - } - - win32: include(windows/windows.pri) - - qtConfig(accessibility-atspi-bridge): include(linux/linux.pri) -} diff --git a/src/gui/accessible/linux/linux.pri b/src/gui/accessible/linux/linux.pri deleted file mode 100644 index 928a96e62a..0000000000 --- a/src/gui/accessible/linux/linux.pri +++ /dev/null @@ -1,27 +0,0 @@ -accessibility_adaptors.files = accessible/linux/dbusxml/Cache.xml accessible/linux/dbusxml/DeviceEventController.xml -accessibility_adaptors.header_flags = -i QtGui/private/qspi_struct_marshallers_p.h -DBUS_ADAPTORS += accessibility_adaptors - -accessibility_interfaces.files = accessible/linux/dbusxml/Socket.xml accessible/linux/dbusxml/Bus.xml -accessibility_interfaces.header_flags = -i QtGui/private/qspi_struct_marshallers_p.h -DBUS_INTERFACES += accessibility_interfaces - -HEADERS += \ - accessible/linux/atspiadaptor_p.h \ - accessible/linux/dbusconnection_p.h \ - accessible/linux/qspi_constant_mappings_p.h \ - accessible/linux/qspi_struct_marshallers_p.h \ - accessible/linux/qspiaccessiblebridge_p.h \ - accessible/linux/qspiapplicationadaptor_p.h \ - accessible/linux/qspidbuscache_p.h - -SOURCES += \ - accessible/linux/atspiadaptor.cpp \ - accessible/linux/dbusconnection.cpp \ - accessible/linux/qspi_constant_mappings.cpp \ - accessible/linux/qspi_struct_marshallers.cpp \ - accessible/linux/qspiaccessiblebridge.cpp \ - accessible/linux/qspiapplicationadaptor.cpp \ - accessible/linux/qspidbuscache.cpp - -QMAKE_USE_PRIVATE += atspi/nolink diff --git a/src/gui/accessible/windows/apisupport/apisupport.pri b/src/gui/accessible/windows/apisupport/apisupport.pri deleted file mode 100644 index b5c0843abc..0000000000 --- a/src/gui/accessible/windows/apisupport/apisupport.pri +++ /dev/null @@ -1,15 +0,0 @@ -HEADERS += \ - accessible/windows/apisupport/qwindowsuiawrapper_p.h \ - accessible/windows/apisupport/uiaattributeids_p.h \ - accessible/windows/apisupport/uiacontroltypeids_p.h \ - accessible/windows/apisupport/uiaerrorids_p.h \ - accessible/windows/apisupport/uiaeventids_p.h \ - accessible/windows/apisupport/uiageneralids_p.h \ - accessible/windows/apisupport/uiaserverinterfaces_p.h \ - accessible/windows/apisupport/uiaclientinterfaces_p.h \ - accessible/windows/apisupport/uiapatternids_p.h \ - accessible/windows/apisupport/uiapropertyids_p.h \ - accessible/windows/apisupport/uiatypes_p.h - -SOURCES += \ - accessible/windows/apisupport/qwindowsuiawrapper.cpp diff --git a/src/gui/accessible/windows/windows.pri b/src/gui/accessible/windows/windows.pri deleted file mode 100644 index 9cebe1e2fb..0000000000 --- a/src/gui/accessible/windows/windows.pri +++ /dev/null @@ -1 +0,0 @@ -include(apisupport/apisupport.pri) diff --git a/src/gui/animation/animation.pri b/src/gui/animation/animation.pri deleted file mode 100644 index add9ae7119..0000000000 --- a/src/gui/animation/animation.pri +++ /dev/null @@ -1,2 +0,0 @@ -SOURCES += \ - animation/qguivariantanimation.cpp diff --git a/src/gui/configure.pri b/src/gui/configure.pri deleted file mode 100644 index 56f995392b..0000000000 --- a/src/gui/configure.pri +++ /dev/null @@ -1,46 +0,0 @@ -# custom tests - -defineTest(qtConfLibrary_freetype) { - input = $$eval($${2}.alias) - isEmpty(config.input.$${input}.incdir) { - TRY_INCLUDEPATHS = $$EXTRA_INCLUDEPATH $$QMAKE_INCDIR_X11 - haiku: TRY_INCLUDEPATHS += /system/develop/headers - TRY_INCLUDEPATHS += $$QMAKE_DEFAULT_INCDIRS - for (p, TRY_INCLUDEPATHS) { - includedir = $$p/freetype2 - exists($$includedir) { - config.input.$${input}.incdir = $$includedir - export(config.input.$${input}.incdir) - break() - } - } - } - qtConfLibrary_inline($$1, $$2): return(true) - return(false) -} - -defineTest(qtConfTest_qpaDefaultPlatform) { - name = - !isEmpty(config.input.qpa_default_platform): name = $$config.input.qpa_default_platform - else: !isEmpty(QT_QPA_DEFAULT_PLATFORM): name = $$QT_QPA_DEFAULT_PLATFORM - else: win32: name = windows - else: android: name = android - else: macos: name = cocoa - else: if(ios|tvos): name = ios - else: watchos: name = minimal - else: qnx: name = qnx - else: integrity: name = integrityfb - else: haiku: name = haiku - else: wasm: name = wasm - else: name = xcb - - $${1}.value = $$name - $${1}.plugin = q$$name - $${1}.name = "\"$$name\"" - export($${1}.value) - export($${1}.plugin) - export($${1}.name) - $${1}.cache += value plugin name - export($${1}.cache) - return(true) -} diff --git a/src/gui/doc/snippets/brush/brush.pro b/src/gui/doc/snippets/brush/brush.pro deleted file mode 100644 index a384e5fee6..0000000000 --- a/src/gui/doc/snippets/brush/brush.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = lib -TARGET = brush_snippets -QT += core gui widgets - -SOURCES = \ - brush.cpp \ - gradientcreationsnippet.cpp - diff --git a/src/gui/doc/snippets/clipboard/clipboard.pro b/src/gui/doc/snippets/clipboard/clipboard.pro deleted file mode 100644 index 521b67aca9..0000000000 --- a/src/gui/doc/snippets/clipboard/clipboard.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = lib -TARGET = clipboard_snippets -QT += core gui widgets - -HEADERS = \ - clipwindow.h - -SOURCES = \ - clipwindow.cpp \ - main.cpp diff --git a/src/gui/doc/snippets/code/code.pro b/src/gui/doc/snippets/code/code.pro deleted file mode 100644 index ee2c0d1c52..0000000000 --- a/src/gui/doc/snippets/code/code.pro +++ /dev/null @@ -1,48 +0,0 @@ -TEMPLATE = lib -TARGET = code_snippets -QT += core gui widgets - -SOURCES = \ - doc_src_coordsys.cpp \ - doc_src_richtext.cpp \ - src_gui_accessible_qaccessible.cpp \ - src_gui_image_qicon.cpp \ - src_gui_image_qimage.cpp \ - src_gui_image_qimagereader.cpp \ - src_gui_image_qimagewriter.cpp \ - src_gui_image_qmovie.cpp \ - src_gui_image_qpixmapcache.cpp \ - src_gui_image_qpixmap.cpp \ - src_gui_itemviews_qstandarditemmodel.cpp \ - src_gui_kernel_qapplication.cpp \ - src_gui_kernel_qclipboard.cpp \ - src_gui_kernel_qevent.cpp \ - src_gui_kernel_qguiapplication.cpp \ - src_gui_kernel_qguiapplication_x11.cpp \ - src_gui_kernel_qkeysequence.cpp \ - src_gui_kernel_qshortcutmap.cpp \ - src_gui_math3d_qquaternion.cpp \ - src_gui_opengl_qopenglbuffer.cpp \ - src_gui_opengl_qopengldebug.cpp \ - src_gui_opengl_qopenglfunctions.cpp \ - src_gui_painting_qbrush.cpp \ - src_gui_painting_qcolor.cpp \ - src_gui_painting_qpainter.cpp \ - src_gui_painting_qpainterpath.cpp \ - src_gui_painting_qpen.cpp \ - src_gui_painting_qregion.cpp \ - src_gui_painting_qregion_unix.cpp \ - src_gui_painting_qtransform.cpp \ - src_gui_qopenglshaderprogram.cpp \ - src_gui_text_qfont.cpp \ - src_gui_text_qfontmetrics.cpp \ - src_gui_text_qsyntaxhighlighter.cpp \ - src_gui_text_qtextcursor.cpp \ - src_gui_text_qtextdocument.cpp \ - src_gui_text_qtextdocumentwriter.cpp \ - src_gui_text_qtextlayout.cpp \ - src_gui_util_qdesktopservices.cpp \ - src_gui_util_qvalidator.cpp \ - src_gui_vulkan_qvulkanfunctions.cpp \ - src_gui_vulkan_qvulkaninstance.cpp \ - src_gui_vulkan_qvulkanwindow.cpp diff --git a/src/gui/doc/snippets/code/doc_src_qtgui.pro b/src/gui/doc/snippets/code/doc_src_qtgui.pro deleted file mode 100644 index a5eb5b576c..0000000000 --- a/src/gui/doc/snippets/code/doc_src_qtgui.pro +++ /dev/null @@ -1,3 +0,0 @@ -#! [1] -QT -= gui -#! [1] diff --git a/src/gui/doc/snippets/draganddrop/draganddrop.pro b/src/gui/doc/snippets/draganddrop/draganddrop.pro deleted file mode 100644 index 99261c2d51..0000000000 --- a/src/gui/doc/snippets/draganddrop/draganddrop.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = lib -TARGET = draganddrop_snippets -QT += core gui widgets - -HEADERS = \ - dragwidget.h - -SOURCES = \ - dragwidget.cpp diff --git a/src/gui/doc/snippets/dragging/dragging.pro b/src/gui/doc/snippets/dragging/dragging.pro deleted file mode 100644 index 0a16eb19bf..0000000000 --- a/src/gui/doc/snippets/dragging/dragging.pro +++ /dev/null @@ -1,5 +0,0 @@ -QT += widgets -HEADERS += mainwindow.h -RESOURCES += images.qrc -SOURCES += main.cpp \ - mainwindow.cpp diff --git a/src/gui/doc/snippets/droparea/droparea.pro b/src/gui/doc/snippets/droparea/droparea.pro deleted file mode 100644 index 33318618e4..0000000000 --- a/src/gui/doc/snippets/droparea/droparea.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = lib -TARGET = droparea_snippets -QT += core gui widgets - -SOURCES = \ - droparea.cpp diff --git a/src/gui/doc/snippets/dropevents/dropevents.pro b/src/gui/doc/snippets/dropevents/dropevents.pro deleted file mode 100644 index 54c3ceeb5b..0000000000 --- a/src/gui/doc/snippets/dropevents/dropevents.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = lib -TARGET = dropevents_snippets -QT += core gui widgets - -SOURCES = \ - window.cpp diff --git a/src/gui/doc/snippets/droprectangle/droprectangle.pro b/src/gui/doc/snippets/droprectangle/droprectangle.pro deleted file mode 100644 index c8ed4d3694..0000000000 --- a/src/gui/doc/snippets/droprectangle/droprectangle.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = lib -TARGET = droprectangle_snippets -QT += core gui widgets - -SOURCES = \ - window.cpp diff --git a/src/gui/doc/snippets/image/image.pro b/src/gui/doc/snippets/image/image.pro deleted file mode 100644 index c9b5e30cd1..0000000000 --- a/src/gui/doc/snippets/image/image.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = lib -TARGET = image_snippets -QT += core gui widgets - -SOURCES = \ - image.cpp \ - supportedformat.cpp - diff --git a/src/gui/doc/snippets/picture/picture.pro b/src/gui/doc/snippets/picture/picture.pro deleted file mode 100644 index 8a3f614546..0000000000 --- a/src/gui/doc/snippets/picture/picture.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = lib -TARGET = picture_snippets -QT += core gui widgets - -SOURCES = \ - picture.cpp - diff --git a/src/gui/doc/snippets/plaintextlayout/plaintextlayout.pro b/src/gui/doc/snippets/plaintextlayout/plaintextlayout.pro deleted file mode 100644 index a0cf7a7b68..0000000000 --- a/src/gui/doc/snippets/plaintextlayout/plaintextlayout.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = lib -TARGET = plaintextlayout_snippets -QT += core gui widgets - -SOURCES = \ - window.cpp diff --git a/src/gui/doc/snippets/polygon/polygon.pro b/src/gui/doc/snippets/polygon/polygon.pro deleted file mode 100644 index 293502a33d..0000000000 --- a/src/gui/doc/snippets/polygon/polygon.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = lib -TARGET = polygon_snippets -QT += core gui widgets - -SOURCES = \ - polygon.cpp - diff --git a/src/gui/doc/snippets/qfileopenevent/qfileopenevent.pro b/src/gui/doc/snippets/qfileopenevent/qfileopenevent.pro deleted file mode 100644 index 3466d6f21b..0000000000 --- a/src/gui/doc/snippets/qfileopenevent/qfileopenevent.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = lib -TARGET = qfileopenevent_snippets -QT += core gui widgets - -SOURCES = \ - main.cpp - diff --git a/src/gui/doc/snippets/qfontdatabase/qfontdatabase.pro b/src/gui/doc/snippets/qfontdatabase/qfontdatabase.pro deleted file mode 100644 index 5c7e455360..0000000000 --- a/src/gui/doc/snippets/qfontdatabase/qfontdatabase.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = lib -TARGET = qfontdatabase_snippets -QT += core gui widgets - -SOURCES = qfontdatabase_snippets.cpp diff --git a/src/gui/doc/snippets/qimagewriter/qimagewriter.pro b/src/gui/doc/snippets/qimagewriter/qimagewriter.pro deleted file mode 100644 index 077d24d49f..0000000000 --- a/src/gui/doc/snippets/qimagewriter/qimagewriter.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = lib -TARGET = qimagewriter_snippets -QT += core gui widgets - -SOURCES = \ - main.cpp - diff --git a/src/gui/doc/snippets/qstatustipevent/qstatustipevent.pro b/src/gui/doc/snippets/qstatustipevent/qstatustipevent.pro deleted file mode 100644 index 8f94f6ce28..0000000000 --- a/src/gui/doc/snippets/qstatustipevent/qstatustipevent.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = lib -TARGET = qstatustipevent_snippets -QT += core gui widgets - -SOURCES = \ - main.cpp - diff --git a/src/gui/doc/snippets/qtextobject/qtextobject.pro b/src/gui/doc/snippets/qtextobject/qtextobject.pro deleted file mode 100644 index 737609ba4c..0000000000 --- a/src/gui/doc/snippets/qtextobject/qtextobject.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = lib -TARGET = textobjectinterface_snippets -QT += core gui widgets - -HEADERS = \ - textobjectinterface.h - diff --git a/src/gui/doc/snippets/scribe-overview/scribe-overview.pro b/src/gui/doc/snippets/scribe-overview/scribe-overview.pro deleted file mode 100644 index 092e6f7b2b..0000000000 --- a/src/gui/doc/snippets/scribe-overview/scribe-overview.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = lib -TARGET = scribe-overview_snippets -QT += core gui widgets - -SOURCES = \ - main.cpp diff --git a/src/gui/doc/snippets/separations/separations.pro b/src/gui/doc/snippets/separations/separations.pro deleted file mode 100644 index d16f0fb3f6..0000000000 --- a/src/gui/doc/snippets/separations/separations.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = lib -TARGET = separations_snippets -QT += core gui widgets - -HEADERS = \ - finalwidget.h \ - screenwidget.h \ - viewer.h -SOURCES = \ - finalwidget.cpp \ - main.cpp \ - screenwidget.cpp \ - viewer.cpp diff --git a/src/gui/doc/snippets/snippets.pro b/src/gui/doc/snippets/snippets.pro deleted file mode 100644 index 6b83dc1ecc..0000000000 --- a/src/gui/doc/snippets/snippets.pro +++ /dev/null @@ -1,45 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = - -contains(QT_BUILD_PARTS, tests) { - SUBDIRS += \ - brush \ - clipboard \ - code \ - draganddrop \ - droparea \ - dropevents \ - droprectangle \ - image \ - picture \ - plaintextlayout \ - polygon \ - qfileopenevent \ - qfontdatabase \ - qimagewriter \ - qstatustipevent \ - qtextobject \ - scribe-overview \ - separations \ - textblock-formats \ - textblock-fragments \ - textdocument-blocks \ - textdocument-charformats \ - textdocument-css \ - textdocument-cursors \ - textdocument-end \ - textdocument-find \ - textdocument-frames \ - textdocument-imagedrop \ - textdocument-imageformat \ - textdocument-images \ - textdocument-listitems \ - textdocument-listitemstyles \ - textdocument-lists \ - textdocument-printing \ - textdocument-resources \ - textdocument-selections \ - textdocument-tables \ - textdocument-texttable \ - transform -} diff --git a/src/gui/doc/snippets/textblock-formats/textblock-formats.pro b/src/gui/doc/snippets/textblock-formats/textblock-formats.pro deleted file mode 100644 index e7f408716f..0000000000 --- a/src/gui/doc/snippets/textblock-formats/textblock-formats.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = lib -TARGET = gui_snippets_textblock_formats -QT += core gui widgets - -SOURCES = \ - main.cpp diff --git a/src/gui/doc/snippets/textblock-fragments/textblock-fragments.pro b/src/gui/doc/snippets/textblock-fragments/textblock-fragments.pro deleted file mode 100644 index b2fbea4fc3..0000000000 --- a/src/gui/doc/snippets/textblock-fragments/textblock-fragments.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = lib -TARGET = gui_snippets_textblock_fragments -QT += core gui widgets xml - -HEADERS = \ - xmlwriter.h -SOURCES = \ - xmlwriter.cpp diff --git a/src/gui/doc/snippets/textdocument-blocks/textdocument-blocks.pro b/src/gui/doc/snippets/textdocument-blocks/textdocument-blocks.pro deleted file mode 100644 index 3b45ba9cb2..0000000000 --- a/src/gui/doc/snippets/textdocument-blocks/textdocument-blocks.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = lib -TARGET = textdocument-blocks_snippets -QT += core gui widgets - -HEADERS = \ - mainwindow.h - -SOURCES = \ - main.cpp \ - mainwindow.cpp diff --git a/src/gui/doc/snippets/textdocument-charformats/textdocument-charformats.pro b/src/gui/doc/snippets/textdocument-charformats/textdocument-charformats.pro deleted file mode 100644 index 2c8654ccfa..0000000000 --- a/src/gui/doc/snippets/textdocument-charformats/textdocument-charformats.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = lib -TARGET = textdocument-charformats -QT += core gui widgets - -SOURCES = \ - main.cpp diff --git a/src/gui/doc/snippets/textdocument-css/textdocument-css.pro b/src/gui/doc/snippets/textdocument-css/textdocument-css.pro deleted file mode 100644 index 40f64b200f..0000000000 --- a/src/gui/doc/snippets/textdocument-css/textdocument-css.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = lib -TARGET = textdocument-css -QT += core gui widgets - -SOURCES += main.cpp diff --git a/src/gui/doc/snippets/textdocument-cursors/textdocument-cursors.pro b/src/gui/doc/snippets/textdocument-cursors/textdocument-cursors.pro deleted file mode 100644 index 6e27f32dc4..0000000000 --- a/src/gui/doc/snippets/textdocument-cursors/textdocument-cursors.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = lib -TARGET = textdocument-cursors -QT += core gui widgets - -SOURCES = \ - main.cpp diff --git a/src/gui/doc/snippets/textdocument-end/textdocument-end.pro b/src/gui/doc/snippets/textdocument-end/textdocument-end.pro deleted file mode 100644 index 3c80ea77c2..0000000000 --- a/src/gui/doc/snippets/textdocument-end/textdocument-end.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = lib -TARGET = textdocumentend_snippets -QT += core gui widgets - -SOURCES = textdocumentendsnippet.cpp diff --git a/src/gui/doc/snippets/textdocument-find/textdocument-find.pro b/src/gui/doc/snippets/textdocument-find/textdocument-find.pro deleted file mode 100644 index 5fc0c7be71..0000000000 --- a/src/gui/doc/snippets/textdocument-find/textdocument-find.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = lib -TARGET = textdocument-find -QT += core gui widgets - -SOURCES = \ - main.cpp diff --git a/src/gui/doc/snippets/textdocument-frames/textdocument-frames.pro b/src/gui/doc/snippets/textdocument-frames/textdocument-frames.pro deleted file mode 100644 index c701a69e04..0000000000 --- a/src/gui/doc/snippets/textdocument-frames/textdocument-frames.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = lib -TARGET = textdocument-frames_snippets -QT += core gui widgets - -HEADERS = \ - mainwindow.h - -SOURCES = \ - mainwindow.cpp \ - main.cpp diff --git a/src/gui/doc/snippets/textdocument-imagedrop/textdocument-imagedrop.pro b/src/gui/doc/snippets/textdocument-imagedrop/textdocument-imagedrop.pro deleted file mode 100644 index 5f1c55f038..0000000000 --- a/src/gui/doc/snippets/textdocument-imagedrop/textdocument-imagedrop.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = lib -TARGET = textdocument-imagedrop -QT += core gui widgets - -HEADERS = \ - textedit.h -SOURCES = \ - main.cpp diff --git a/src/gui/doc/snippets/textdocument-imageformat/textdocument-imageformat.pro b/src/gui/doc/snippets/textdocument-imageformat/textdocument-imageformat.pro deleted file mode 100644 index f770f68593..0000000000 --- a/src/gui/doc/snippets/textdocument-imageformat/textdocument-imageformat.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = lib -TARGET = textdocument-imageformat -QT += widgets core gui - -SOURCES = \ - main.cpp - -RESOURCES = \ - images.qrc diff --git a/src/gui/doc/snippets/textdocument-images/textdocument-images.pro b/src/gui/doc/snippets/textdocument-images/textdocument-images.pro deleted file mode 100644 index de6bd3a53a..0000000000 --- a/src/gui/doc/snippets/textdocument-images/textdocument-images.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = lib -TARGET = textdocument-images -QT += widgets core gui - -SOURCES = \ - main.cpp - -RESOURCES = \ - images.qrc diff --git a/src/gui/doc/snippets/textdocument-listitems/textdocument-listitems.pro b/src/gui/doc/snippets/textdocument-listitems/textdocument-listitems.pro deleted file mode 100644 index a41f35fd50..0000000000 --- a/src/gui/doc/snippets/textdocument-listitems/textdocument-listitems.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = lib -TARGET = textdocument-listitems -QT += widgets core gui - -HEADERS = \ - mainwindow.h -SOURCES = \ - main.cpp \ - mainwindow.cpp - diff --git a/src/gui/doc/snippets/textdocument-listitemstyles/textdocument-listitemstyles.pro b/src/gui/doc/snippets/textdocument-listitemstyles/textdocument-listitemstyles.pro deleted file mode 100644 index df710a4dcd..0000000000 --- a/src/gui/doc/snippets/textdocument-listitemstyles/textdocument-listitemstyles.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = lib -TARGET = textdocument-listitemstyles -QT += core gui widgets - -HEADERS = \ - mainwindow.h - -SOURCES = \ - main.cpp \ - mainwindow.cpp diff --git a/src/gui/doc/snippets/textdocument-lists/textdocument-lists.pro b/src/gui/doc/snippets/textdocument-lists/textdocument-lists.pro deleted file mode 100644 index c37654876c..0000000000 --- a/src/gui/doc/snippets/textdocument-lists/textdocument-lists.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = lib -TARGET = textdocument-lists -QT += core gui widgets - -SOURCES = \ - mainwindow.cpp diff --git a/src/gui/doc/snippets/textdocument-printing/textdocument-printing.pro b/src/gui/doc/snippets/textdocument-printing/textdocument-printing.pro deleted file mode 100644 index f6d7a6d74d..0000000000 --- a/src/gui/doc/snippets/textdocument-printing/textdocument-printing.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = lib -TARGET = textdocument-printing -QT += core gui widgets printsupport - -HEADERS = \ - mainwindow.h - -SOURCES = \ - main.cpp \ - mainwindow.cpp diff --git a/src/gui/doc/snippets/textdocument-resources/textdocument-resources.pro b/src/gui/doc/snippets/textdocument-resources/textdocument-resources.pro deleted file mode 100644 index 7400f6981f..0000000000 --- a/src/gui/doc/snippets/textdocument-resources/textdocument-resources.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = lib -TARGET = textdocument-resources -QT += core gui widgets - -SOURCES = \ - main.cpp diff --git a/src/gui/doc/snippets/textdocument-selections/textdocument-selections.pro b/src/gui/doc/snippets/textdocument-selections/textdocument-selections.pro deleted file mode 100644 index 79e36d3881..0000000000 --- a/src/gui/doc/snippets/textdocument-selections/textdocument-selections.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = lib -TARGET = textdocument-selections -QT += core gui widgets - -HEADERS = \ - mainwindow.h - -SOURCES = \ - main.cpp \ - mainwindow.cpp diff --git a/src/gui/doc/snippets/textdocument-tables/textdocument-tables.pro b/src/gui/doc/snippets/textdocument-tables/textdocument-tables.pro deleted file mode 100644 index 97081aa333..0000000000 --- a/src/gui/doc/snippets/textdocument-tables/textdocument-tables.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = lib -TARGET = textdocument-tables_snippets -QT += core gui widgets - -HEADERS = \ - mainwindow.h - -SOURCES = \ - main.cpp \ - mainwindow.cpp diff --git a/src/gui/doc/snippets/textdocument-texttable/textdocument-texttable.pro b/src/gui/doc/snippets/textdocument-texttable/textdocument-texttable.pro deleted file mode 100644 index ad475cef7e..0000000000 --- a/src/gui/doc/snippets/textdocument-texttable/textdocument-texttable.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = lib -TARGET = textdocument-texttable -QT += core gui widgets - -SOURCES = \ - main.cpp \ diff --git a/src/gui/doc/snippets/transform/transform.pro b/src/gui/doc/snippets/transform/transform.pro deleted file mode 100644 index 5d51b3fba3..0000000000 --- a/src/gui/doc/snippets/transform/transform.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = lib -TARGET = transform_snippets -QT += core gui widgets - -SOURCES = \ - main.cpp diff --git a/src/gui/gui.pro b/src/gui/gui.pro deleted file mode 100644 index 13631aba67..0000000000 --- a/src/gui/gui.pro +++ /dev/null @@ -1,86 +0,0 @@ -TARGET = QtGui -QT = core-private - -qtConfig(opengl.*): MODULE_CONFIG = opengl - -DEFINES += QT_NO_USING_NAMESPACE QT_NO_FOREACH - -QMAKE_DOCS = $$PWD/doc/qtgui.qdocconf - -MODULE_PLUGIN_TYPES = \ - accessiblebridge \ - platforms \ - platforms/darwin \ - xcbglintegrations \ - platformthemes \ - platforminputcontexts \ - generic \ - iconengines \ - imageformats \ - egldeviceintegrations - -# Code coverage with TestCocoon -# The following is required as extra compilers use $$QMAKE_CXX instead of $(CXX). -# Without this, testcocoon.prf is read only after $$QMAKE_CXX is used by the -# extra compilers. -testcocoon { - load(testcocoon) -} - -osx: LIBS_PRIVATE += -framework AppKit -darwin: LIBS_PRIVATE += -framework CoreGraphics - -CONFIG += simd optimize_full - -include(accessible/accessible.pri) -include(kernel/kernel.pri) -include(image/image.pri) -include(text/text.pri) -include(painting/painting.pri) -include(util/util.pri) -include(math3d/math3d.pri) -include(opengl/opengl.pri) -qtConfig(animation): include(animation/animation.pri) -include(itemmodels/itemmodels.pri) -include(vulkan/vulkan.pri) -include(platform/platform.pri) -include(rhi/rhi.pri) - -QMAKE_LIBS += $$QMAKE_LIBS_GUI - -load(qt_module) -load(cmake_functions) - -win32: { - CMAKE_WINDOWS_BUILD = True - QMAKE_USE_PRIVATE += shell32 -} - -qtConfig(egl) { - CMAKE_EGL_LIBS = $$cmakeProcessLibs($$QMAKE_LIBS_EGL) - !isEmpty(QMAKE_LIBDIR_EGL): CMAKE_EGL_LIBDIR += $$cmakeTargetPath($$QMAKE_LIBDIR_EGL) -} - -qtConfig(opengles2) { - !isEmpty(QMAKE_INCDIR_OPENGL_ES2): CMAKE_GL_INCDIRS = $$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL_ES2) - CMAKE_OPENGL_INCDIRS = $$cmakePortablePaths($$QMAKE_INCDIR_OPENGL_ES2) - CMAKE_OPENGL_LIBS = $$cmakeProcessLibs($$QMAKE_LIBS_OPENGL_ES2) - !isEmpty(QMAKE_LIBDIR_OPENGL_ES2): CMAKE_OPENGL_LIBDIR = $$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL_ES2) - CMAKE_GL_HEADER_NAME = GLES2/gl2.h - CMAKE_QT_OPENGL_IMPLEMENTATION = GLESv2 -} else: qtConfig(opengl) { - !isEmpty(QMAKE_INCDIR_OPENGL): CMAKE_GL_INCDIRS = $$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL) - CMAKE_OPENGL_INCDIRS = $$cmakePortablePaths($$QMAKE_INCDIR_OPENGL) - !qtConfig(dynamicgl): CMAKE_OPENGL_LIBS = $$cmakeProcessLibs($$QMAKE_LIBS_OPENGL) - !isEmpty(QMAKE_LIBDIR_OPENGL): CMAKE_OPENGL_LIBDIR = $$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL) - CMAKE_GL_HEADER_NAME = GL/gl.h - mac: CMAKE_GL_HEADER_NAME = gl.h - CMAKE_QT_OPENGL_IMPLEMENTATION = GL -} - -qtConfig(egl): CMAKE_EGL_INCDIRS = $$cmakePortablePaths($$QMAKE_INCDIR_EGL) - -QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtGui.dynlist - -TRACEPOINT_PROVIDER = $$PWD/qtgui.tracepoints -CONFIG += qt_tracepoints metatypes install_metatypes diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri deleted file mode 100644 index f503c97b82..0000000000 --- a/src/gui/image/image.pri +++ /dev/null @@ -1,107 +0,0 @@ -# -*-mode:sh-*- -# Qt image handling - -# Qt kernel module - -HEADERS += \ - image/qbitmap.h \ - image/qimage.h \ - image/qimage_p.h \ - image/qimageiohandler.h \ - image/qimagereader.h \ - image/qimagereaderwriterhelpers_p.h \ - image/qimagewriter.h \ - image/qpaintengine_pic_p.h \ - image/qpicture.h \ - image/qpicture_p.h \ - image/qpixmap.h \ - image/qpixmap_raster_p.h \ - image/qpixmap_blitter_p.h \ - image/qpixmapcache.h \ - image/qpixmapcache_p.h \ - image/qplatformpixmap.h \ - image/qimagepixmapcleanuphooks_p.h \ - image/qicon.h \ - image/qicon_p.h \ - image/qiconloader_p.h \ - image/qiconengine.h \ - image/qiconengineplugin.h \ - image/qabstractfileiconengine_p.h \ - image/qabstractfileiconprovider.h \ - image/qabstractfileiconprovider_p.h - -SOURCES += \ - image/qbitmap.cpp \ - image/qimage.cpp \ - image/qimage_conversions.cpp \ - image/qimageiohandler.cpp \ - image/qimagereader.cpp \ - image/qimagereaderwriterhelpers.cpp \ - image/qimagewriter.cpp \ - image/qpaintengine_pic.cpp \ - image/qpicture.cpp \ - image/qpixmap.cpp \ - image/qpixmapcache.cpp \ - image/qplatformpixmap.cpp \ - image/qpixmap_raster.cpp \ - image/qpixmap_blitter.cpp \ - image/qimagepixmapcleanuphooks.cpp \ - image/qicon.cpp \ - image/qiconloader.cpp \ - image/qiconengine.cpp \ - image/qiconengineplugin.cpp \ - image/qabstractfileiconengine.cpp \ - image/qabstractfileiconprovider.cpp - -qtConfig(movie) { - HEADERS += image/qmovie.h - SOURCES += image/qmovie.cpp -} - -win32: SOURCES += image/qpixmap_win.cpp - -darwin: OBJECTIVE_SOURCES += image/qimage_darwin.mm - -# Built-in image format support -HEADERS += \ - image/qbmphandler_p.h \ - image/qppmhandler_p.h \ - image/qxbmhandler_p.h \ - image/qxpmhandler_p.h - -SOURCES += \ - image/qbmphandler.cpp \ - image/qppmhandler.cpp \ - image/qxbmhandler.cpp \ - image/qxpmhandler.cpp - -qtConfig(png) { - HEADERS += image/qpnghandler_p.h - SOURCES += image/qpnghandler.cpp - QMAKE_USE_PRIVATE += libpng - - win32:mingw { - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86048 - GCC_VERSION = "$${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.$${QMAKE_GCC_PATCH_VERSION}" - equals(GCC_VERSION, "8.1.0") { - QMAKE_CXXFLAGS += -fno-reorder-blocks-and-partition - } - } -} - -# SIMD -!android { - SSSE3_SOURCES += image/qimage_ssse3.cpp - NEON_SOURCES += image/qimage_neon.cpp - MIPS_DSPR2_SOURCES += image/qimage_mips_dspr2.cpp - MIPS_DSPR2_ASM += image/qimage_mips_dspr2_asm.S -} else { - # see https://developer.android.com/ndk/guides/abis - arm64-v8a | armeabi-v7a { - SOURCES += image/qimage_neon.cpp - } - x86 | x86_64 { - DEFINES += QT_COMPILER_SUPPORTS_SSE2 QT_COMPILER_SUPPORTS_SSE3 QT_COMPILER_SUPPORTS_SSSE3 - SOURCES += image/qimage_ssse3.cpp - } -} diff --git a/src/gui/image/qpnghandler.pri b/src/gui/image/qpnghandler.pri deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/gui/itemmodels/itemmodels.pri b/src/gui/itemmodels/itemmodels.pri deleted file mode 100644 index 4de6cc29e2..0000000000 --- a/src/gui/itemmodels/itemmodels.pri +++ /dev/null @@ -1,19 +0,0 @@ -qtConfig(standarditemmodel) { - HEADERS += \ - itemmodels/qstandarditemmodel.h \ - itemmodels/qstandarditemmodel_p.h \ - - SOURCES += \ - itemmodels/qstandarditemmodel.cpp \ -} - -qtConfig(filesystemmodel) { - HEADERS += \ - itemmodels/qfilesystemmodel.h \ - itemmodels/qfilesystemmodel_p.h \ - itemmodels/qfileinfogatherer_p.h - - SOURCES += \ - itemmodels/qfilesystemmodel.cpp \ - itemmodels/qfileinfogatherer.cpp -} diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri deleted file mode 100644 index f709784e2f..0000000000 --- a/src/gui/kernel/kernel.pri +++ /dev/null @@ -1,191 +0,0 @@ -# Qt kernel module - -# Only used on platforms with CONFIG += precompile_header -PRECOMPILED_HEADER = kernel/qt_gui_pch.h - - -KERNEL_P= kernel -HEADERS += \ - kernel/qoffscreensurface_p.h \ - kernel/qoffscreensurface_platform.h \ - kernel/qtguiglobal.h \ - kernel/qtguiglobal_p.h \ - kernel/qgenericpluginfactory.h \ - kernel/qgenericplugin.h \ - kernel/qwindowsysteminterface.h \ - kernel/qwindowsysteminterface_p.h \ - kernel/qplatformintegration.h \ - kernel/qplatformscreen.h \ - kernel/qplatformscreen_p.h \ - kernel/qplatforminputcontext.h \ - kernel/qplatforminputcontext_p.h \ - kernel/qplatforminputcontextfactory_p.h \ - kernel/qplatforminputcontextplugin_p.h \ - kernel/qplatformintegrationfactory_p.h \ - kernel/qplatformintegrationplugin.h \ - kernel/qplatformtheme.h \ - kernel/qplatformtheme_p.h \ - kernel/qplatformthemefactory_p.h \ - kernel/qplatformthemeplugin.h \ - kernel/qplatformwindow.h \ - kernel/qplatformoffscreensurface.h \ - kernel/qplatformwindow_p.h \ - kernel/qplatformcursor.h \ - kernel/qplatformclipboard.h \ - kernel/qplatformnativeinterface.h \ - kernel/qplatformmenu.h \ - kernel/qplatformmenu_p.h \ - kernel/qsurfaceformat.h \ - kernel/qguiapplication.h \ - kernel/qguiapplication_p.h \ - kernel/qwindow_p.h \ - kernel/qwindow.h \ - kernel/qoffscreensurface.h \ - kernel/qplatformsurface.h \ - kernel/qsurface.h \ - kernel/qclipboard.h \ - kernel/qcursor.h \ - kernel/qcursor_p.h \ - kernel/qevent.h \ - kernel/qevent_p.h \ - kernel/qeventpoint.h \ - kernel/qeventpoint_p.h \ - kernel/qinputdevice.h \ - kernel/qinputdevice_p.h \ - kernel/qinputmethod.h \ - kernel/qinputmethod_p.h \ - kernel/qinternalmimedata_p.h \ - kernel/qkeymapper_p.h \ - kernel/qpalette.h \ - kernel/qsessionmanager.h \ - kernel/qsessionmanager_p.h \ - kernel/qwindowdefs.h \ - kernel/qscreen.h \ - kernel/qscreen_p.h \ - kernel/qstylehints.h \ - kernel/qpointingdevice.h \ - kernel/qpointingdevice_p.h \ - kernel/qplatformsharedgraphicscache.h \ - kernel/qplatformdialoghelper.h \ - kernel/qplatformservices.h \ - kernel/qplatformsystemtrayicon.h \ - kernel/qplatformsessionmanager.h \ - kernel/qpixelformat.h \ - kernel/qpaintdevicewindow.h \ - kernel/qpaintdevicewindow_p.h \ - kernel/qrasterwindow.h \ - kernel/qplatformgraphicsbuffer.h \ - kernel/qplatformgraphicsbufferhelper.h \ - kernel/qinputdevicemanager_p.h \ - kernel/qinputdevicemanager_p_p.h \ - kernel/qhighdpiscaling_p.h \ - kernel/qtestsupport_gui.h - -SOURCES += \ - kernel/qgenericpluginfactory.cpp \ - kernel/qgenericplugin.cpp \ - kernel/qwindowsysteminterface.cpp \ - kernel/qplatforminputcontextfactory.cpp \ - kernel/qplatforminputcontextplugin.cpp \ - kernel/qplatforminputcontext.cpp \ - kernel/qplatformintegration.cpp \ - kernel/qplatformscreen.cpp \ - kernel/qplatformintegrationfactory.cpp \ - kernel/qplatformintegrationplugin.cpp \ - kernel/qplatformtheme.cpp \ - kernel/qplatformthemefactory.cpp \ - kernel/qplatformthemeplugin.cpp \ - kernel/qplatformwindow.cpp \ - kernel/qplatformoffscreensurface.cpp \ - kernel/qplatformcursor.cpp \ - kernel/qplatformclipboard.cpp \ - kernel/qplatformnativeinterface.cpp \ - kernel/qsessionmanager.cpp \ - kernel/qsurfaceformat.cpp \ - kernel/qguiapplication.cpp \ - kernel/qwindow.cpp \ - kernel/qoffscreensurface.cpp \ - kernel/qplatformsurface.cpp \ - kernel/qsurface.cpp \ - kernel/qclipboard.cpp \ - kernel/qcursor.cpp \ - kernel/qevent.cpp \ - kernel/qeventpoint.cpp \ - kernel/qinputdevice.cpp \ - kernel/qinputmethod.cpp \ - kernel/qinternalmimedata.cpp \ - kernel/qkeymapper.cpp \ - kernel/qpalette.cpp \ - kernel/qguivariant.cpp \ - kernel/qscreen.cpp \ - kernel/qstylehints.cpp \ - kernel/qpointingdevice.cpp \ - kernel/qplatformsharedgraphicscache.cpp \ - kernel/qplatformdialoghelper.cpp \ - kernel/qplatformservices.cpp \ - kernel/qplatformsystemtrayicon.cpp \ - kernel/qplatformsessionmanager.cpp \ - kernel/qplatformmenu.cpp \ - kernel/qpixelformat.cpp \ - kernel/qpaintdevicewindow.cpp \ - kernel/qrasterwindow.cpp \ - kernel/qplatformgraphicsbuffer.cpp \ - kernel/qplatformgraphicsbufferhelper.cpp \ - kernel/qinputdevicemanager.cpp \ - kernel/qhighdpiscaling.cpp \ - kernel/qtestsupport_gui.cpp - -qtConfig(action) { - HEADERS += \ - kernel/qaction.h \ - kernel/qaction_p.h \ - kernel/qactiongroup.h \ - kernel/qactiongroup_p.h - - SOURCES += \ - kernel/qactiongroup.cpp \ - kernel/qaction.cpp -} - -qtConfig(draganddrop) { - HEADERS += \ - kernel/qdnd_p.h \ - kernel/qdrag.h \ - kernel/qplatformdrag.h \ - kernel/qshapedpixmapdndwindow_p.h \ - kernel/qsimpledrag_p.h - - SOURCES += \ - kernel/qdnd.cpp \ - kernel/qdrag.cpp \ - kernel/qplatformdrag.cpp \ - kernel/qshapedpixmapdndwindow.cpp \ - kernel/qsimpledrag.cpp -} - -qtConfig(opengl) { - HEADERS += \ - kernel/qplatformopenglcontext.h \ - kernel/qopenglcontext.h \ - kernel/qopenglcontext_p.h \ - kernel/qopenglcontext_platform.h \ - - SOURCES += \ - kernel/qplatformopenglcontext.cpp \ - kernel/qopenglcontext.cpp -} - -qtConfig(shortcut) { - HEADERS += \ - kernel/qshortcut.h \ - kernel/qshortcut_p.h \ - kernel/qshortcutmap_p.h \ - kernel/qkeysequence.h \ - kernel/qkeysequence_p.h - SOURCES += \ - kernel/qshortcut.cpp \ - kernel/qshortcutmap.cpp \ - kernel/qkeysequence.cpp -} - -win32:HEADERS+=kernel/qwindowdefs_win.h diff --git a/src/gui/math3d/math3d.pri b/src/gui/math3d/math3d.pri deleted file mode 100644 index 0cbc3db0e1..0000000000 --- a/src/gui/math3d/math3d.pri +++ /dev/null @@ -1,14 +0,0 @@ -HEADERS += \ - math3d/qgenericmatrix.h \ - math3d/qmatrix4x4.h \ - math3d/qquaternion.h \ - math3d/qvector2d.h \ - math3d/qvector3d.h \ - math3d/qvector4d.h \ - math3d/qvectornd.h \ - -SOURCES += \ - math3d/qgenericmatrix.cpp \ - math3d/qmatrix4x4.cpp \ - math3d/qquaternion.cpp \ - math3d/qvectornd.cpp \ diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri deleted file mode 100644 index 61f333ec69..0000000000 --- a/src/gui/opengl/opengl.pri +++ /dev/null @@ -1,19 +0,0 @@ -# Qt gui library, opengl module - -qtConfig(opengl): CONFIG += opengl -qtConfig(opengles2): CONFIG += opengles2 - -qtConfig(opengl) { - HEADERS += opengl/qopengl.h \ - opengl/qopengl_p.h \ - opengl/qopenglfunctions.h \ - opengl/qopenglextensions_p.h \ - opengl/qopenglextrafunctions.h \ - opengl/qopenglprogrambinarycache_p.h - - SOURCES += opengl/qopengl.cpp \ - opengl/qopenglfunctions.cpp \ - opengl/qopenglprogrambinarycache.cpp -} - -include(platform/platform.pri) diff --git a/src/gui/opengl/platform/egl/egl.pri b/src/gui/opengl/platform/egl/egl.pri deleted file mode 100644 index 78d3cc2e54..0000000000 --- a/src/gui/opengl/platform/egl/egl.pri +++ /dev/null @@ -1,32 +0,0 @@ -HEADERS += \ - opengl/platform/egl/qeglconvenience_p.h \ - opengl/platform/egl/qeglstreamconvenience_p.h \ - opengl/platform/egl/qt_egl_p.h - -SOURCES += \ - opengl/platform/egl/qeglconvenience.cpp \ - opengl/platform/egl/qeglstreamconvenience.cpp - -qtConfig(opengl) { - HEADERS += \ - opengl/platform/egl/qeglplatformcontext_p.h \ - opengl/platform/egl/qeglpbuffer_p.h - - SOURCES += \ - opengl/platform/egl/qeglplatformcontext.cpp \ - opengl/platform/egl/qeglpbuffer.cpp -} - -qtConfig(egl_x11) { - HEADERS += \ - opengl/platform/egl/qxlibeglintegration_p.h - SOURCES += \ - opengl/platform/egl/qxlibeglintegration.cpp - QMAKE_USE_PRIVATE += xlib -} else { - # Avoid X11 header collision, use generic EGL native types - DEFINES += QT_EGL_NO_X11 -} -CONFIG += egl - -qtConfig(dlopen): QMAKE_USE_PRIVATE += libdl diff --git a/src/gui/opengl/platform/platform.pri b/src/gui/opengl/platform/platform.pri deleted file mode 100644 index 193bd9e59b..0000000000 --- a/src/gui/opengl/platform/platform.pri +++ /dev/null @@ -1,4 +0,0 @@ -qtConfig(xlib):qtConfig(opengl):!qtConfig(opengles2): \ - include(unix/unix.pri) -qtConfig(egl): \ - include(egl/egl.pri) diff --git a/src/gui/opengl/platform/unix/unix.pri b/src/gui/opengl/platform/unix/unix.pri deleted file mode 100644 index 6365a18756..0000000000 --- a/src/gui/opengl/platform/unix/unix.pri +++ /dev/null @@ -1,7 +0,0 @@ -HEADERS += \ - opengl/platform/unix/qglxconvenience_p.h - -SOURCES += \ - opengl/platform/unix/qglxconvenience.cpp - -QMAKE_USE_PRIVATE += xlib diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri deleted file mode 100644 index 1262b1775c..0000000000 --- a/src/gui/painting/painting.pri +++ /dev/null @@ -1,176 +0,0 @@ -# Qt gui library, paint module - -HEADERS += \ - painting/qbackingstore.h \ - painting/qbezier_p.h \ - painting/qblendfunctions_p.h \ - painting/qblittable_p.h \ - painting/qbrush.h \ - painting/qcolor.h \ - painting/qcolor_p.h \ - painting/qcolormatrix_p.h \ - painting/qcolorspace.h \ - painting/qcolorspace_p.h \ - painting/qcolortransferfunction_p.h \ - painting/qcolortransfertable_p.h \ - painting/qcolortransform.h \ - painting/qcolortransform_p.h \ - painting/qcolortrc_p.h \ - painting/qcolortrclut_p.h \ - painting/qcosmeticstroker_p.h \ - painting/qdatabuffer_p.h \ - painting/qdrawhelper_p.h \ - painting/qdrawhelper_x86_p.h \ - painting/qdrawingprimitive_sse2_p.h \ - painting/qemulationpaintengine_p.h \ - painting/qfixed_p.h \ - painting/qgrayraster_p.h \ - painting/qicc_p.h \ - painting/qmemrotate_p.h \ - painting/qoutlinemapper_p.h \ - painting/qpagedpaintdevice.h \ - painting/qpagedpaintdevice_p.h \ - painting/qpagelayout.h \ - painting/qpageranges.h \ - painting/qpageranges_p.h \ - painting/qpagesize.h \ - painting/qpaintdevice.h \ - painting/qpaintengine.h \ - painting/qpaintengine_p.h \ - painting/qpaintengineex_p.h \ - painting/qpaintengine_blitter_p.h \ - painting/qpaintengine_raster_p.h \ - painting/qpainter.h \ - painting/qpainter_p.h \ - painting/qpainterpath.h \ - painting/qpainterpath_p.h \ - painting/qvectorpath_p.h \ - painting/qpathclipper_p.h \ - painting/qpdf_p.h \ - painting/qpdfwriter.h \ - painting/qpen.h \ - painting/qpixellayout_p.h \ - painting/qpolygon.h \ - painting/qrasterdefs_p.h \ - painting/qrasterizer_p.h \ - painting/qrbtree_p.h \ - painting/qregion.h \ - painting/qrgb.h \ - painting/qrgba64.h \ - painting/qrgba64_p.h \ - painting/qstroker_p.h \ - painting/qtextureglyphcache_p.h \ - painting/qtransform.h \ - painting/qtriangulatingstroker_p.h \ - painting/qtriangulator_p.h \ - painting/qplatformbackingstore.h \ - painting/qpathsimplifier_p.h - - -SOURCES += \ - painting/qbackingstore.cpp \ - painting/qbezier.cpp \ - painting/qblendfunctions.cpp \ - painting/qblittable.cpp \ - painting/qbrush.cpp \ - painting/qcolor.cpp \ - painting/qcolorspace.cpp \ - painting/qcolortransform.cpp \ - painting/qcolortrclut.cpp \ - painting/qcompositionfunctions.cpp \ - painting/qcosmeticstroker.cpp \ - painting/qdrawhelper.cpp \ - painting/qemulationpaintengine.cpp \ - painting/qgrayraster.c \ - painting/qicc.cpp \ - painting/qimagescale.cpp \ - painting/qmemrotate.cpp \ - painting/qoutlinemapper.cpp \ - painting/qpagedpaintdevice.cpp \ - painting/qpagelayout.cpp \ - painting/qpageranges.cpp \ - painting/qpagesize.cpp \ - painting/qpaintdevice.cpp \ - painting/qpaintengine.cpp \ - painting/qpaintengineex.cpp \ - painting/qpaintengine_blitter.cpp \ - painting/qpaintengine_raster.cpp \ - painting/qpainter.cpp \ - painting/qpainterpath.cpp \ - painting/qpathclipper.cpp \ - painting/qpdf.cpp \ - painting/qpdfwriter.cpp \ - painting/qpen.cpp \ - painting/qpixellayout.cpp \ - painting/qpolygon.cpp \ - painting/qrasterizer.cpp \ - painting/qregion.cpp \ - painting/qstroker.cpp \ - painting/qtextureglyphcache.cpp \ - painting/qtransform.cpp \ - painting/qtriangulatingstroker.cpp \ - painting/qtriangulator.cpp \ - painting/qplatformbackingstore.cpp \ - painting/qpathsimplifier.cpp - -RESOURCES += \ - painting/qpdf.qrc \ - -darwin { - HEADERS += \ - painting/qcoregraphics_p.h \ - painting/qrasterbackingstore_p.h - SOURCES += \ - painting/qcoregraphics.mm \ - painting/qrasterbackingstore.cpp -} - -qtConfig(cssparser) { - SOURCES += \ - painting/qcssutil.cpp -} - -# Causes internal compiler errors with at least GCC 5.3.1: -gcc:equals(QT_GCC_MAJOR_VERSION, 5) { - SOURCES -= painting/qdrawhelper.cpp - NO_PCH_SOURCES += painting/qdrawhelper.cpp -} - -!android { - SSE2_SOURCES += painting/qdrawhelper_sse2.cpp - SSSE3_SOURCES += painting/qdrawhelper_ssse3.cpp - SSE4_1_SOURCES += painting/qdrawhelper_sse4.cpp \ - painting/qimagescale_sse4.cpp - ARCH_HASWELL_SOURCES += painting/qdrawhelper_avx2.cpp - - NEON_SOURCES += painting/qdrawhelper_neon.cpp painting/qimagescale_neon.cpp - NEON_HEADERS += painting/qdrawhelper_neon_p.h -} -!uikit:!win32:contains(QT_ARCH, "arm"): CONFIG += no_clang_integrated_as -!android:!uikit:!win32:!integrity:!contains(QT_ARCH, "arm64") { - NEON_ASM += ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S - DEFINES += ENABLE_PIXMAN_DRAWHELPERS -} - -!android { - MIPS_DSP_SOURCES += painting/qdrawhelper_mips_dsp.cpp - MIPS_DSP_HEADERS += painting/qdrawhelper_mips_dsp_p.h painting/qt_mips_asm_dsp_p.h - MIPS_DSP_ASM += painting/qdrawhelper_mips_dsp_asm.S - MIPS_DSPR2_ASM += painting/qdrawhelper_mips_dspr2_asm.S -} else { - # see https://developer.android.com/ndk/guides/abis - x86 | x86_64 { - DEFINES += QT_COMPILER_SUPPORTS_SSE2 QT_COMPILER_SUPPORTS_SSE3 QT_COMPILER_SUPPORTS_SSSE3 - SOURCES += painting/qdrawhelper_sse2.cpp painting/qdrawhelper_ssse3.cpp - } - x86_64 { - DEFINES += QT_COMPILER_SUPPORTS_SSE4_1 QT_COMPILER_SUPPORTS_SSE4_2 - SOURCES += painting/qdrawhelper_sse4.cpp painting/qimagescale_sse4.cpp - } - arm64-v8a | armeabi-v7a { - SOURCES += painting/qdrawhelper_neon.cpp painting/qimagescale_neon.cpp - HEADERS += painting/qdrawhelper_neon_p.h - } -} - -include($$PWD/../../3rdparty/zlib_dependency.pri) diff --git a/src/gui/platform/android/android.pri b/src/gui/platform/android/android.pri deleted file mode 100644 index f60cae1011..0000000000 --- a/src/gui/platform/android/android.pri +++ /dev/null @@ -1 +0,0 @@ -SOURCES += $$PWD/qandroidnativeinterface.cpp diff --git a/src/gui/platform/darwin/darwin.pri b/src/gui/platform/darwin/darwin.pri deleted file mode 100644 index c8d26c997b..0000000000 --- a/src/gui/platform/darwin/darwin.pri +++ /dev/null @@ -1,4 +0,0 @@ -HEADERS += $$PWD/qmacmime_p.h -SOURCES += $$PWD/qmacmime.mm -LIBS += -framework ImageIO -macos: LIBS_PRIVATE += -framework AppKit diff --git a/src/gui/platform/macos/macos.pri b/src/gui/platform/macos/macos.pri deleted file mode 100644 index 1931507427..0000000000 --- a/src/gui/platform/macos/macos.pri +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES += \ - $$PWD/qcocoanativeinterface.mm - -LIBS_PRIVATE += -framework AppKit diff --git a/src/gui/platform/platform.pri b/src/gui/platform/platform.pri deleted file mode 100644 index 6240069f09..0000000000 --- a/src/gui/platform/platform.pri +++ /dev/null @@ -1,6 +0,0 @@ -wasm:include(wasm/wasm.pri) -darwin:include(darwin/darwin.pri) -win32:include(windows/windows.pri) -unix:include(unix/unix.pri) -macos:include(macos/macos.pri) -android:include(android/android.pri) diff --git a/src/gui/platform/unix/dbusmenu/dbusmenu.pri b/src/gui/platform/unix/dbusmenu/dbusmenu.pri deleted file mode 100644 index c328f23144..0000000000 --- a/src/gui/platform/unix/dbusmenu/dbusmenu.pri +++ /dev/null @@ -1,15 +0,0 @@ -HEADERS += \ - platform/unix/dbusmenu/qdbusmenuadaptor_p.h \ - platform/unix/dbusmenu/qdbusmenutypes_p.h \ - platform/unix/dbusmenu/qdbusmenuconnection_p.h \ - platform/unix/dbusmenu/qdbusmenubar_p.h \ - platform/unix/dbusmenu/qdbusmenuregistrarproxy_p.h \ - platform/unix/dbusmenu/qdbusplatformmenu_p.h - -SOURCES += \ - platform/unix/dbusmenu/qdbusmenuadaptor.cpp \ - platform/unix/dbusmenu/qdbusmenutypes.cpp \ - platform/unix/dbusmenu/qdbusmenuconnection.cpp \ - platform/unix/dbusmenu/qdbusmenubar.cpp \ - platform/unix/dbusmenu/qdbusmenuregistrarproxy.cpp \ - platform/unix/dbusmenu/qdbusplatformmenu.cpp diff --git a/src/gui/platform/unix/dbustray/dbustray.pri b/src/gui/platform/unix/dbustray/dbustray.pri deleted file mode 100644 index cc5b40ef42..0000000000 --- a/src/gui/platform/unix/dbustray/dbustray.pri +++ /dev/null @@ -1,11 +0,0 @@ -HEADERS += \ - platform/unix/dbustray/qdbustrayicon_p.h \ - platform/unix/dbustray/qdbustraytypes_p.h \ - platform/unix/dbustray/qstatusnotifieritemadaptor_p.h \ - platform/unix/dbustray/qxdgnotificationproxy_p.h - -SOURCES += \ - platform/unix/dbustray/qdbustrayicon.cpp \ - platform/unix/dbustray/qdbustraytypes.cpp \ - platform/unix/dbustray/qstatusnotifieritemadaptor.cpp \ - platform/unix/dbustray/qxdgnotificationproxy.cpp diff --git a/src/gui/platform/unix/unix.pri b/src/gui/platform/unix/unix.pri deleted file mode 100644 index 0e320650fd..0000000000 --- a/src/gui/platform/unix/unix.pri +++ /dev/null @@ -1,45 +0,0 @@ -SOURCES += \ - platform/unix/qunixeventdispatcher.cpp \ - platform/unix/qgenericunixeventdispatcher.cpp \ - platform/unix/qunixnativeinterface.cpp - -HEADERS += \ - platform/unix/qunixeventdispatcher_qpa_p.h \ - platform/unix/qgenericunixeventdispatcher_p.h - - -qtConfig(glib) { - SOURCES += platform/unix/qeventdispatcher_glib.cpp - HEADERS += platform/unix/qeventdispatcher_glib_p.h - QMAKE_USE_PRIVATE += glib -} - -if(unix:!uikit)|qtConfig(xcb) { - SOURCES += \ - platform/unix/qgenericunixservices.cpp - HEADERS += \ - platform/unix/qgenericunixservices_p.h - - qtHaveModule(dbus): QT_PRIVATE += dbus -} - -if(unix:!uikit:!macos)|qtConfig(xcb) { - SOURCES += \ - platform/unix/qgenericunixthemes.cpp - HEADERS += \ - platform/unix/qgenericunixthemes_p.h - - qtHaveModule(dbus) { - include(dbusmenu/dbusmenu.pri) - qtConfig(systemtrayicon): include(dbustray/dbustray.pri) - } -} - -qtConfig(xkbcommon) { - SOURCES += \ - platform/unix/qxkbcommon_3rdparty.cpp \ - platform/unix/qxkbcommon.cpp - HEADERS += \ - platform/unix/qxkbcommon_p.h - QMAKE_USE_PRIVATE += xkbcommon -} diff --git a/src/gui/platform/wasm/wasm.pri b/src/gui/platform/wasm/wasm.pri deleted file mode 100644 index 1b5d7eadb5..0000000000 --- a/src/gui/platform/wasm/wasm.pri +++ /dev/null @@ -1,3 +0,0 @@ -INCLUDEDIR += $$PWD -HEADERS += $$PWD/qwasmlocalfileaccess_p.h -SOURCES += $$PWD/qwasmlocalfileaccess.cpp diff --git a/src/gui/platform/windows/windows.pri b/src/gui/platform/windows/windows.pri deleted file mode 100644 index 9155362d1d..0000000000 --- a/src/gui/platform/windows/windows.pri +++ /dev/null @@ -1,7 +0,0 @@ -HEADERS += \ - platform/windows/qwindowsguieventdispatcher_p.h \ - platform/windows/qwindowsmime_p.h - -SOURCES += \ - platform/windows/qwindowsguieventdispatcher.cpp \ - platform/windows/qwindowsnativeinterface.cpp diff --git a/src/gui/rhi/rhi.pri b/src/gui/rhi/rhi.pri deleted file mode 100644 index ccd9592634..0000000000 --- a/src/gui/rhi/rhi.pri +++ /dev/null @@ -1,57 +0,0 @@ -HEADERS += \ - rhi/qrhi_p.h \ - rhi/qrhi_p_p.h \ - rhi/qrhiprofiler_p.h \ - rhi/qrhiprofiler_p_p.h \ - rhi/qrhinull_p.h \ - rhi/qrhinull_p_p.h \ - rhi/qshader_p.h \ - rhi/qshader_p_p.h \ - rhi/qshaderdescription_p.h \ - rhi/qshaderdescription_p_p.h - -SOURCES += \ - rhi/qrhi.cpp \ - rhi/qrhiprofiler.cpp \ - rhi/qrhinull.cpp \ - rhi/qshaderdescription.cpp \ - rhi/qshader.cpp - -qtConfig(opengl) { - HEADERS += \ - rhi/qrhigles2_p.h \ - rhi/qrhigles2_p_p.h - SOURCES += \ - rhi/qrhigles2.cpp -} - -qtConfig(vulkan) { - HEADERS += \ - rhi/qrhivulkan_p.h \ - rhi/qrhivulkan_p_p.h - SOURCES += \ - rhi/qrhivulkan.cpp -} - -win32 { - HEADERS += \ - rhi/qrhid3d11_p.h \ - rhi/qrhid3d11_p_p.h - SOURCES += \ - rhi/qrhid3d11.cpp - - LIBS += -ld3d11 -ldxgi -ldxguid -} - -macos|ios { - HEADERS += \ - rhi/qrhimetal_p.h \ - rhi/qrhimetal_p_p.h - SOURCES += \ - rhi/qrhimetal.mm - - macos: LIBS += -framework AppKit - LIBS += -framework Metal -} - -include($$PWD/../../3rdparty/VulkanMemoryAllocator.pri) diff --git a/src/gui/text/coretext/coretext.pri b/src/gui/text/coretext/coretext.pri deleted file mode 100644 index 31470ae583..0000000000 --- a/src/gui/text/coretext/coretext.pri +++ /dev/null @@ -1,19 +0,0 @@ -HEADERS += $$PWD/qcoretextfontdatabase_p.h $$PWD/qfontengine_coretext_p.h -OBJECTIVE_SOURCES += $$PWD/qfontengine_coretext.mm $$PWD/qcoretextfontdatabase.mm - -LIBS_PRIVATE += \ - -framework CoreFoundation \ - -framework CoreGraphics \ - -framework CoreText \ - -framework Foundation - -macos: \ - LIBS_PRIVATE += -framework AppKit -else: \ - LIBS_PRIVATE += -framework UIKit - -CONFIG += watchos_coretext - -qtConfig(freetype) { - QMAKE_USE_PRIVATE += freetype -} diff --git a/src/gui/text/freetype/freetype.pri b/src/gui/text/freetype/freetype.pri deleted file mode 100644 index 7bda687ef4..0000000000 --- a/src/gui/text/freetype/freetype.pri +++ /dev/null @@ -1,9 +0,0 @@ -HEADERS += \ - $$PWD/qfreetypefontdatabase_p.h \ - $$PWD/qfontengine_ft_p.h - -SOURCES += \ - $$PWD/qfreetypefontdatabase.cpp \ - $$PWD/qfontengine_ft.cpp - -QMAKE_USE_PRIVATE += freetype diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri deleted file mode 100644 index 4c927a876b..0000000000 --- a/src/gui/text/text.pri +++ /dev/null @@ -1,139 +0,0 @@ -# Qt kernel module - -HEADERS += \ - text/qfont.h \ - text/qfontdatabase.h \ - text/qfontdatabase_p.h \ - text/qfontengine_p.h \ - text/qfontengineglyphcache_p.h \ - text/qfontinfo.h \ - text/qfontmetrics.h \ - text/qfont_p.h \ - text/qfontsubset_p.h \ - text/qtextengine_p.h \ - text/qtextlayout.h \ - text/qtextformat.h \ - text/qtextformat_p.h \ - text/qtextobject.h \ - text/qtextobject_p.h \ - text/qtextoption.h \ - text/qfragmentmap_p.h \ - text/qtextdocument.h \ - text/qtextdocument_p.h \ - text/qtexthtmlparser_p.h \ - text/qabstracttextdocumentlayout.h \ - text/qabstracttextdocumentlayout_p.h \ - text/qtextdocumentlayout_p.h \ - text/qtextcursor.h \ - text/qtextcursor_p.h \ - text/qtextdocumentfragment.h \ - text/qtextdocumentfragment_p.h \ - text/qtextimagehandler_p.h \ - text/qtexttable.h \ - text/qtextlist.h \ - text/qsyntaxhighlighter.h \ - text/qtextdocumentwriter.h \ - text/qtexttable_p.h \ - text/qstatictext_p.h \ - text/qstatictext.h \ - text/qrawfont.h \ - text/qrawfont_p.h \ - text/qglyphrun.h \ - text/qglyphrun_p.h \ - text/qdistancefield_p.h \ - text/qinputcontrol_p.h - -SOURCES += \ - text/qfont.cpp \ - text/qfontengine.cpp \ - text/qfontengineglyphcache.cpp \ - text/qfontsubset.cpp \ - text/qfontmetrics.cpp \ - text/qfontdatabase.cpp \ - text/qtextengine.cpp \ - text/qtextlayout.cpp \ - text/qtextformat.cpp \ - text/qtextobject.cpp \ - text/qtextoption.cpp \ - text/qfragmentmap.cpp \ - text/qtextdocument.cpp \ - text/qtextdocument_p.cpp \ - text/qtexthtmlparser.cpp \ - text/qabstracttextdocumentlayout.cpp \ - text/qtextdocumentlayout.cpp \ - text/qtextcursor.cpp \ - text/qtextdocumentfragment.cpp \ - text/qtextimagehandler.cpp \ - text/qtexttable.cpp \ - text/qtextlist.cpp \ - text/qtextdocumentwriter.cpp \ - text/qsyntaxhighlighter.cpp \ - text/qstatictext.cpp \ - text/qrawfont.cpp \ - text/qglyphrun.cpp \ - text/qdistancefield.cpp \ - text/qinputcontrol.cpp - -SOURCES += \ - text/qplatformfontdatabase.cpp - -HEADERS += \ - text/qplatformfontdatabase.h - -qtConfig(harfbuzz) { - QMAKE_USE_PRIVATE += harfbuzz - - SOURCES += text/qharfbuzzng.cpp - HEADERS += text/qharfbuzzng_p.h -} - -qtConfig(textodfwriter) { - HEADERS += \ - text/qtextodfwriter_p.h \ - text/qzipreader_p.h \ - text/qzipwriter_p.h - SOURCES += \ - text/qtextodfwriter.cpp \ - text/qzip.cpp -} - -qtConfig(textmarkdownreader) { - qtConfig(system-textmarkdownreader) { - QMAKE_USE_PRIVATE += libmd4c - } else { - include($$PWD/../../3rdparty/md4c.pri) - } - HEADERS += \ - text/qtextmarkdownimporter_p.h - SOURCES += \ - text/qtextmarkdownimporter.cpp -} - -qtConfig(textmarkdownwriter) { - HEADERS += \ - text/qtextmarkdownwriter_p.h - SOURCES += \ - text/qtextmarkdownwriter.cpp -} - -qtConfig(cssparser) { - HEADERS += \ - text/qcssparser_p.h - SOURCES += \ - text/qcssparser.cpp -} - -qtConfig(freetype) { - include($$PWD/freetype/freetype.pri) - unix:!darwin { - include($$PWD/unix/unix.pri) - } -} - -darwin { - include($$PWD/coretext/coretext.pri) -} - -win32 { - include($$PWD/windows/windows.pri) -} diff --git a/src/gui/text/unix/unix.pri b/src/gui/text/unix/unix.pri deleted file mode 100644 index 538c16ecfe..0000000000 --- a/src/gui/text/unix/unix.pri +++ /dev/null @@ -1,13 +0,0 @@ -HEADERS += text/unix/qgenericunixfontdatabase_p.h - -qtConfig(fontconfig) { - HEADERS += \ - text/unix/qfontconfigdatabase_p.h \ - text/unix/qfontenginemultifontconfig_p.h - - SOURCES += \ - text/unix/qfontconfigdatabase.cpp \ - text/unix/qfontenginemultifontconfig.cpp - - QMAKE_USE_PRIVATE += fontconfig -} diff --git a/src/gui/text/windows/windows.pri b/src/gui/text/windows/windows.pri deleted file mode 100644 index 91f803d740..0000000000 --- a/src/gui/text/windows/windows.pri +++ /dev/null @@ -1,35 +0,0 @@ -SOURCES += \ - text/windows/qwindowsfontdatabase.cpp \ - text/windows/qwindowsfontdatabasebase.cpp \ - text/windows/qwindowsfontengine.cpp \ - text/windows/qwindowsnativeimage.cpp - -HEADERS += \ - text/windows/qwindowsfontdatabase_p.h \ - text/windows/qwindowsfontdatabasebase_p.h \ - text/windows/qwindowsfontengine_p.h \ - text/windows/qwindowsnativeimage_p.h - -qtConfig(freetype) { - SOURCES += text/windows/qwindowsfontdatabase_ft.cpp - HEADERS += text/windows/qwindowsfontdatabase_ft_p.h - QMAKE_USE_PRIVATE += freetype -} - -qtConfig(directwrite):qtConfig(direct2d) { - qtConfig(directwrite3) { - QMAKE_USE_PRIVATE += dwrite_3 - - SOURCES += text/windows/qwindowsdirectwritefontdatabase.cpp - HEADERS += text/windows/qwindowsdirectwritefontdatabase_p.h - } else { - QMAKE_USE_PRIVATE += dwrite_2 - } - QMAKE_USE_PRIVATE += d2d1 - - SOURCES += text/windows/qwindowsfontenginedirectwrite.cpp - HEADERS += text/windows/qwindowsfontenginedirectwrite_p.h -} - -QMAKE_USE_PRIVATE += advapi32 ole32 user32 gdi32 -mingw: QMAKE_USE_PRIVATE += uuid diff --git a/src/gui/util/util.pri b/src/gui/util/util.pri deleted file mode 100644 index 31a243c23f..0000000000 --- a/src/gui/util/util.pri +++ /dev/null @@ -1,64 +0,0 @@ -# Qt util module - -HEADERS += \ - util/qdesktopservices.h \ - util/qedidparser_p.h \ - util/qedidvendortable_p.h \ - util/qhexstring_p.h \ - util/qvalidator.h \ - util/qgridlayoutengine_p.h \ - util/qabstractlayoutstyleinfo_p.h \ - util/qlayoutpolicy_p.h \ - util/qshaderformat_p.h \ - util/qshadergraph_p.h \ - util/qshadergraphloader_p.h \ - util/qshaderlanguage_p.h \ - util/qshadernode_p.h \ - util/qshadernodeport_p.h \ - util/qshadernodesloader_p.h \ - util/qtexturefiledata_p.h \ - util/qtexturefilereader_p.h \ - util/qtexturefilehandler_p.h \ - util/qpkmhandler_p.h \ - util/qktxhandler_p.h \ - util/qastchandler_p.h - -SOURCES += \ - util/qdesktopservices.cpp \ - util/qedidparser.cpp \ - util/qvalidator.cpp \ - util/qgridlayoutengine.cpp \ - util/qabstractlayoutstyleinfo.cpp \ - util/qlayoutpolicy.cpp \ - util/qshaderformat.cpp \ - util/qshadergraph.cpp \ - util/qshadergraphloader.cpp \ - util/qshaderlanguage.cpp \ - util/qshadernode.cpp \ - util/qshadernodeport.cpp \ - util/qshadernodesloader.cpp \ - util/qtexturefiledata.cpp \ - util/qtexturefilereader.cpp \ - util/qpkmhandler.cpp \ - util/qktxhandler.cpp \ - util/qastchandler.cpp - -qtConfig(regularexpression) { - HEADERS += \ - util/qshadergenerator_p.h - SOURCES += \ - util/qshadergenerator.cpp -} - -qtConfig(undocommand) { - HEADERS += \ - util/qundostack.h \ - util/qundostack_p.h - - SOURCES += util/qundostack.cpp -} - -qtConfig(undogroup) { - HEADERS += util/qundogroup.h - SOURCES += util/qundogroup.cpp -} diff --git a/src/gui/vulkan/vulkan.pri b/src/gui/vulkan/vulkan.pri deleted file mode 100644 index 3ac3b8edc3..0000000000 --- a/src/gui/vulkan/vulkan.pri +++ /dev/null @@ -1,63 +0,0 @@ -qtConfig(vulkan) { - CONFIG += generated_privates - - HEADERS += \ - vulkan/qvulkaninstance.h \ - vulkan/qplatformvulkaninstance.h \ - vulkan/qvulkanwindow.h \ - vulkan/qvulkanwindow_p.h \ - vulkan/qbasicvulkanplatforminstance_p.h - - SOURCES += \ - vulkan/qvulkaninstance.cpp \ - vulkan/qplatformvulkaninstance.cpp \ - vulkan/qvulkanfunctions.cpp \ - vulkan/qvulkanwindow.cpp \ - vulkan/qbasicvulkanplatforminstance.cpp - - # Applications must inherit the Vulkan header include path. - QMAKE_USE += vulkan/nolink -} - -qtConfig(vkgen) { - # Generate qvulkanfunctions.h, qvulkanfunctions_p.h, qvulkanfunctions_p.cpp - QMAKE_QVKGEN_INPUT = vulkan/vk.xml - QMAKE_QVKGEN_LICENSE_HEADER = $$QT_SOURCE_TREE/header.LGPL - qtPrepareTool(QMAKE_QVKGEN, qvkgen) - - qvkgen_h.commands = $$QMAKE_QVKGEN ${QMAKE_FILE_IN} $$shell_quote($$QMAKE_QVKGEN_LICENSE_HEADER) ${QMAKE_FILE_OUT_PATH}/${QMAKE_FILE_OUT_BASE} - qvkgen_h.output = $$OUT_PWD/vulkan/qvulkanfunctions.h - qvkgen_h.input = QMAKE_QVKGEN_INPUT - qtConfig(vulkan): \ - qvkgen_h.variable_out = HEADERS - else: \ - qvkgen_h.CONFIG += target_predeps no_link - QMAKE_EXTRA_COMPILERS += qvkgen_h - - qvkgen_ph.commands = $$escape_expand(\\n) - qvkgen_ph.output = $$OUT_PWD/vulkan/qvulkanfunctions_p.h - qvkgen_ph.input = QMAKE_QVKGEN_INPUT - qvkgen_ph.depends += $$OUT_PWD/vulkan/qvulkanfunctions.h - qtConfig(vulkan): \ - qvkgen_ph.variable_out = HEADERS - else: \ - qvkgen_ph.CONFIG += target_predeps no_link - QMAKE_EXTRA_COMPILERS += qvkgen_ph - - qvkgen_pimpl.commands = $$escape_expand(\\n) - qvkgen_pimpl.output = $$OUT_PWD/vulkan/qvulkanfunctions_p.cpp - qvkgen_pimpl.input = QMAKE_QVKGEN_INPUT - qvkgen_pimpl.depends += $$OUT_PWD/vulkan/qvulkanfunctions_p.h - qtConfig(vulkan): \ - qvkgen_pimpl.variable_out = SOURCES - else: \ - qvkgen_pimpl.CONFIG += target_predeps no_link - QMAKE_EXTRA_COMPILERS += qvkgen_pimpl -} else { - # generate dummy files to make qmake happy - write_file($$OUT_PWD/vulkan/qvulkanfunctions.h) - write_file($$OUT_PWD/vulkan/qvulkanfunctions_p.h) -} - -# Ensure qvulkanfunctions.h gets installed correctly -targ_headers.CONFIG += no_check_exist -- cgit v1.2.3