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 --- .../xcb/gl_integrations/gl_integrations.pri | 13 --- .../xcb/gl_integrations/gl_integrations.pro | 10 -- .../gl_integrations_plugin_base.pri | 7 -- .../xcb/gl_integrations/xcb_egl/xcb_egl.pro | 23 ----- .../xcb/gl_integrations/xcb_glx/xcb_glx.pro | 26 ----- .../xcb/nativepainting/nativepainting.pri | 23 ----- src/plugins/platforms/xcb/xcb-plugin.pro | 17 ---- src/plugins/platforms/xcb/xcb.pro | 7 -- src/plugins/platforms/xcb/xcb_qpa_lib.pro | 109 --------------------- 9 files changed, 235 deletions(-) delete mode 100644 src/plugins/platforms/xcb/gl_integrations/gl_integrations.pri delete mode 100644 src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro delete mode 100644 src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri delete mode 100644 src/plugins/platforms/xcb/gl_integrations/xcb_egl/xcb_egl.pro delete mode 100644 src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro delete mode 100644 src/plugins/platforms/xcb/nativepainting/nativepainting.pri delete mode 100644 src/plugins/platforms/xcb/xcb-plugin.pro delete mode 100644 src/plugins/platforms/xcb/xcb.pro delete mode 100644 src/plugins/platforms/xcb/xcb_qpa_lib.pro (limited to 'src/plugins/platforms/xcb') diff --git a/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pri b/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pri deleted file mode 100644 index 56bc126652..0000000000 --- a/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pri +++ /dev/null @@ -1,13 +0,0 @@ -INCLUDEPATH += $$PWD - -HEADERS += \ - $$PWD/qxcbglintegration.h \ - $$PWD/qxcbglintegrationfactory.h \ - $$PWD/qxcbglintegrationplugin.h \ - $$PWD/qxcbnativeinterfacehandler.h - -SOURCES += \ - $$PWD/qxcbglintegrationfactory.cpp \ - $$PWD/qxcbglintegration.cpp \ - $$PWD/qxcbnativeinterfacehandler.cpp - diff --git a/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro b/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro deleted file mode 100644 index dde176433c..0000000000 --- a/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = subdirs -QT_FOR_CONFIG += gui-private - -qtConfig(xcb-egl-plugin) { - SUBDIRS += xcb_egl -} - -qtConfig(xcb-glx-plugin) { - SUBDIRS += xcb_glx -} diff --git a/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri b/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri deleted file mode 100644 index 98e48b706f..0000000000 --- a/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri +++ /dev/null @@ -1,7 +0,0 @@ -QT += core-private gui-private xcb_qpa_lib-private - -INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../ - -load(qt_build_paths) - diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/xcb_egl.pro b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/xcb_egl.pro deleted file mode 100644 index fe10ca4acd..0000000000 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/xcb_egl.pro +++ /dev/null @@ -1,23 +0,0 @@ -TARGET = qxcb-egl-integration - -include(../gl_integrations_plugin_base.pri) - -CONFIG += egl - -DEFINES += QT_NO_FOREACH - -HEADERS += \ - qxcbeglcontext.h \ - qxcbeglintegration.h \ - qxcbeglwindow.h \ - qxcbeglnativeinterfacehandler.h - -SOURCES += \ - qxcbeglintegration.cpp \ - qxcbeglwindow.cpp \ - qxcbeglmain.cpp \ - qxcbeglnativeinterfacehandler.cpp - -PLUGIN_CLASS_NAME = QXcbEglIntegrationPlugin -PLUGIN_TYPE = xcbglintegrations -load(qt_plugin) diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro deleted file mode 100644 index 0ba7926f9a..0000000000 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro +++ /dev/null @@ -1,26 +0,0 @@ -TARGET = qxcb-glx-integration - -include(../gl_integrations_plugin_base.pri) - -DEFINES += QT_NO_FOREACH - -qtConfig(xcb-glx): QMAKE_USE += xcb_glx - -!static:qtConfig(dlopen): QMAKE_USE += libdl - -HEADERS += \ - qxcbglxintegration.h \ - qxcbglxwindow.h \ - qglxintegration.h \ - qxcbglxnativeinterfacehandler.h - -SOURCES += \ - qxcbglxmain.cpp \ - qxcbglxintegration.cpp \ - qxcbglxwindow.cpp \ - qglxintegration.cpp \ - qxcbglxnativeinterfacehandler.cpp - -PLUGIN_CLASS_NAME = QXcbGlxIntegrationPlugin -PLUGIN_TYPE = xcbglintegrations -load(qt_plugin) diff --git a/src/plugins/platforms/xcb/nativepainting/nativepainting.pri b/src/plugins/platforms/xcb/nativepainting/nativepainting.pri deleted file mode 100644 index e1a47fb7d7..0000000000 --- a/src/plugins/platforms/xcb/nativepainting/nativepainting.pri +++ /dev/null @@ -1,23 +0,0 @@ -qtConfig(xcb-native-painting) { - qtConfig(xrender): QMAKE_USE += xrender - qtConfig(fontconfig): QMAKE_USE_PRIVATE += freetype - - INCLUDEPATH += $$PWD - HEADERS += \ - $$PWD/qtessellator_p.h \ - $$PWD/qpixmap_x11_p.h \ - $$PWD/qpaintengine_x11_p.h \ - $$PWD/qpolygonclipper_p.h \ - $$PWD/qt_x11_p.h \ - $$PWD/qcolormap_x11_p.h \ - $$PWD/qbackingstore_x11_p.h \ - $$PWD/qxcbnativepainting.h - - SOURCES += \ - $$PWD/qtessellator.cpp \ - $$PWD/qpixmap_x11.cpp \ - $$PWD/qpaintengine_x11.cpp \ - $$PWD/qcolormap_x11.cpp \ - $$PWD/qbackingstore_x11.cpp \ - $$PWD/qxcbnativepainting.cpp -} diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro deleted file mode 100644 index 4c646d42c6..0000000000 --- a/src/plugins/platforms/xcb/xcb-plugin.pro +++ /dev/null @@ -1,17 +0,0 @@ -TARGET = qxcb - -QT += core-private gui-private xcb_qpa_lib-private - -DEFINES += QT_NO_FOREACH - -macos: CONFIG += no_app_extension_api_only - -SOURCES = \ - qxcbmain.cpp - -OTHER_FILES += xcb.json README - -PLUGIN_TYPE = platforms -PLUGIN_CLASS_NAME = QXcbIntegrationPlugin -!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = - -load(qt_plugin) diff --git a/src/plugins/platforms/xcb/xcb.pro b/src/plugins/platforms/xcb/xcb.pro deleted file mode 100644 index 1c43c5ca04..0000000000 --- a/src/plugins/platforms/xcb/xcb.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = subdirs -CONFIG += ordered -QT_FOR_CONFIG += gui-private - -SUBDIRS += xcb_qpa_lib.pro -SUBDIRS += xcb-plugin.pro -SUBDIRS += gl_integrations diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro deleted file mode 100644 index 29eb2906e9..0000000000 --- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro +++ /dev/null @@ -1,109 +0,0 @@ -TARGET = QtXcbQpa -CONFIG += no_module_headers internal_module -DEFINES += QT_NO_FOREACH - -QT += core-private gui-private - -qtConfig(opengl): QT += opengl-private - -qtConfig(glib) : QMAKE_USE_PRIVATE += glib - -SOURCES = \ - qxcbclipboard.cpp \ - qxcbconnection.cpp \ - qxcbintegration.cpp \ - qxcbkeyboard.cpp \ - qxcbscrollingdevice.cpp \ - qxcbmime.cpp \ - qxcbscreen.cpp \ - qxcbwindow.cpp \ - qxcbbackingstore.cpp \ - qxcbwmsupport.cpp \ - qxcbnativeinterface.cpp \ - qxcbcursor.cpp \ - qxcbimage.cpp \ - qxcbxsettings.cpp \ - qxcbsystemtraytracker.cpp \ - qxcbeventqueue.cpp \ - qxcbeventdispatcher.cpp \ - qxcbconnection_basic.cpp \ - qxcbconnection_screens.cpp \ - qxcbconnection_xi2.cpp \ - qxcbatom.cpp - -HEADERS = \ - qxcbclipboard.h \ - qxcbconnection.h \ - qxcbintegration.h \ - qxcbkeyboard.h \ - qxcbscrollingdevice_p.h \ - qxcbmime.h \ - qxcbobject.h \ - qxcbscreen.h \ - qxcbwindow.h \ - qxcbbackingstore.h \ - qxcbwmsupport.h \ - qxcbnativeinterface.h \ - qxcbcursor.h \ - qxcbimage.h \ - qxcbxsettings.h \ - qxcbsystemtraytracker.h \ - qxcbeventqueue.h \ - qxcbeventdispatcher.h \ - qxcbconnection_basic.h \ - qxcbatom.h - -qtConfig(draganddrop) { - SOURCES += qxcbdrag.cpp - HEADERS += qxcbdrag.h -} - -load(qt_build_paths) - -DEFINES += QT_BUILD_XCB_PLUGIN - -qtConfig(xcb-xlib) { - QMAKE_USE += xcb_xlib -} - -qtConfig(xcb-sm) { - QMAKE_USE += x11sm - SOURCES += qxcbsessionmanager.cpp - HEADERS += qxcbsessionmanager.h -} - -include(gl_integrations/gl_integrations.pri) -include(nativepainting/nativepainting.pri) - -qtConfig(vulkan) { - SOURCES += \ - qxcbvulkaninstance.cpp \ - qxcbvulkanwindow.cpp - - HEADERS += \ - qxcbvulkaninstance.h \ - qxcbvulkanwindow.h -} - -QMAKE_USE += \ - xcb xcb_icccm xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil \ - xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xkb xkbcommon xkbcommon_x11 - -qtConfig(system-xcb-xinput) { - QMAKE_USE += xcb_xinput -} else { - # Use bundled xcb-xinput sources. - XCB_DIR = $$QT_SOURCE_TREE/src/3rdparty/xcb - INCLUDEPATH += $$XCB_DIR/include/ - SOURCES += $$XCB_DIR/libxcb/xinput.c - # Ignore compiler warnings in 3rdparty C code. - QMAKE_CFLAGS+=-w -} - -qtConfig(dlopen): QMAKE_USE += libdl - -# qxcbkeyboard.cpp's KeyTbl has more than 256 levels of expansion and older -# Clang uses that as a limit (it's 1024 in current versions). -clang:!intel_icc: QMAKE_CXXFLAGS += -ftemplate-depth=1024 - -load(qt_module) -- cgit v1.2.3