diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-12-17 14:55:57 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-01-07 15:32:28 +0100 |
commit | ad2da2d27a590333fc89a56fc58700a09c3017b3 (patch) | |
tree | 7d916e7a15150d1ba3ca4af7f167e33f9d3c6cc6 /src/gui/opengl | |
parent | fca3ea040c9d05f112c6fc018f0c8e8c68892642 (diff) |
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 <edward.welbourne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/gui/opengl')
-rw-r--r-- | src/gui/opengl/opengl.pri | 19 | ||||
-rw-r--r-- | src/gui/opengl/platform/egl/egl.pri | 32 | ||||
-rw-r--r-- | src/gui/opengl/platform/platform.pri | 4 | ||||
-rw-r--r-- | src/gui/opengl/platform/unix/unix.pri | 7 |
4 files changed, 0 insertions, 62 deletions
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 |