From 9d43b8d9702a1b2cf9482485ac74eb18da2532a2 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 28 Oct 2011 10:39:01 +0200 Subject: [PATCH] Gui/OpenGL: Remove remains of qpa from profiles. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: Iff2531a19030bd782ee4cd9bbe529d18666503f9 Reviewed-by: Samuel Rødal --- src/gui/image/image.pri | 19 +-------- src/gui/kernel/kernel.pri | 98 ++++++++++++++++++++++------------------------- src/opengl/opengl.pro | 1 - 3 files changed, 47 insertions(+), 71 deletions(-) diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index 3ccfb04..ba200bf 100644 --- a/src/gui/image/image.pri +++ b/src/gui/image/image.pri @@ -45,24 +45,7 @@ SOURCES += \ image/qimagepixmapcleanuphooks.cpp \ image/qvolatileimage.cpp -qpa: { - SOURCES += image/qpixmap_qpa.cpp -} -else:win32 { - SOURCES += image/qpixmap_win.cpp -} -else:x11 { - HEADERS += image/qpixmap_x11_p.h - SOURCES += image/qpixmap_x11.cpp -} -else:mac { - HEADERS += image/qpixmap_mac_p.h - SOURCES += image/qpixmap_mac.cpp -} -else:symbian { - HEADERS += image/qpixmap_s60_p.h - SOURCES += image/qpixmap_s60.cpp -} +SOURCES += image/qpixmap_qpa.cpp !symbian|contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2) { SOURCES += image/qvolatileimagedata.cpp diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index 318adcd..d01e39c 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -6,6 +6,30 @@ PRECOMPILED_HEADER = kernel/qt_gui_pch.h KERNEL_P= kernel HEADERS += \ + kernel/qgenericpluginfactory_qpa.h \ + kernel/qgenericplugin_qpa.h \ + kernel/qwindowsysteminterface_qpa.h \ + kernel/qwindowsysteminterface_qpa_p.h \ + kernel/qplatformintegration_qpa.h \ + kernel/qplatformdrag_qpa.h \ + kernel/qplatformscreen_qpa.h \ + kernel/qplatforminputcontext_qpa.h \ + kernel/qplatformintegrationfactory_qpa_p.h \ + kernel/qplatformintegrationplugin_qpa.h \ + kernel/qplatformwindow_qpa.h \ + kernel/qplatformopenglcontext_qpa.h \ + kernel/qopenglcontext.h \ + kernel/qopenglcontext_p.h \ + kernel/qplatformcursor_qpa.h \ + kernel/qplatformclipboard_qpa.h \ + kernel/qplatformnativeinterface_qpa.h \ + kernel/qsurfaceformat.h \ + kernel/qguiapplication.h \ + kernel/qguiapplication_p.h \ + kernel/qwindow_p.h \ + kernel/qwindow.h \ + kernel/qplatformsurface_qpa.h \ + kernel/qsurface.h \ kernel/qclipboard.h \ kernel/qcursor.h \ kernel/qcursor_p.h \ @@ -26,6 +50,28 @@ HEADERS += \ kernel/qstylehints.h SOURCES += \ + kernel/qclipboard_qpa.cpp \ + kernel/qcursor_qpa.cpp \ + kernel/qgenericpluginfactory_qpa.cpp \ + kernel/qgenericplugin_qpa.cpp \ + kernel/qwindowsysteminterface_qpa.cpp \ + kernel/qplatforminputcontext_qpa.cpp \ + kernel/qplatformintegration_qpa.cpp \ + kernel/qplatformscreen_qpa.cpp \ + kernel/qplatformintegrationfactory_qpa.cpp \ + kernel/qplatformintegrationplugin_qpa.cpp \ + kernel/qplatformwindow_qpa.cpp \ + kernel/qplatformopenglcontext_qpa.cpp \ + kernel/qopenglcontext.cpp \ + kernel/qplatformcursor_qpa.cpp \ + kernel/qplatformclipboard_qpa.cpp \ + kernel/qplatformnativeinterface_qpa.cpp \ + kernel/qsessionmanager_qpa.cpp \ + kernel/qsurfaceformat.cpp \ + kernel/qguiapplication.cpp \ + kernel/qwindow.cpp \ + kernel/qplatformsurface_qpa.cpp \ + kernel/qsurface.cpp \ kernel/qclipboard.cpp \ kernel/qcursor.cpp \ kernel/qdrag.cpp \ @@ -41,56 +87,4 @@ SOURCES += \ kernel/qshortcutmap.cpp \ kernel/qstylehints.cpp -qpa { - HEADERS += \ - kernel/qgenericpluginfactory_qpa.h \ - kernel/qgenericplugin_qpa.h \ - kernel/qwindowsysteminterface_qpa.h \ - kernel/qwindowsysteminterface_qpa_p.h \ - kernel/qplatformintegration_qpa.h \ - kernel/qplatformdrag_qpa.h \ - kernel/qplatformscreen_qpa.h \ - kernel/qplatforminputcontext_qpa.h \ - kernel/qplatformintegrationfactory_qpa_p.h \ - kernel/qplatformintegrationplugin_qpa.h \ - kernel/qplatformwindow_qpa.h \ - kernel/qplatformopenglcontext_qpa.h \ - kernel/qopenglcontext.h \ - kernel/qopenglcontext_p.h \ - kernel/qplatformcursor_qpa.h \ - kernel/qplatformclipboard_qpa.h \ - kernel/qplatformnativeinterface_qpa.h \ - kernel/qsurfaceformat.h \ - kernel/qguiapplication.h \ - kernel/qguiapplication_p.h \ - kernel/qwindow_p.h \ - kernel/qwindow.h \ - kernel/qplatformsurface_qpa.h \ - kernel/qsurface.h - - SOURCES += \ - kernel/qclipboard_qpa.cpp \ - kernel/qcursor_qpa.cpp \ - kernel/qgenericpluginfactory_qpa.cpp \ - kernel/qgenericplugin_qpa.cpp \ - kernel/qwindowsysteminterface_qpa.cpp \ - kernel/qplatforminputcontext_qpa.cpp \ - kernel/qplatformintegration_qpa.cpp \ - kernel/qplatformscreen_qpa.cpp \ - kernel/qplatformintegrationfactory_qpa.cpp \ - kernel/qplatformintegrationplugin_qpa.cpp \ - kernel/qplatformwindow_qpa.cpp \ - kernel/qplatformopenglcontext_qpa.cpp \ - kernel/qopenglcontext.cpp \ - kernel/qplatformcursor_qpa.cpp \ - kernel/qplatformclipboard_qpa.cpp \ - kernel/qplatformnativeinterface_qpa.cpp \ - kernel/qsessionmanager_qpa.cpp \ - kernel/qsurfaceformat.cpp \ - kernel/qguiapplication.cpp \ - kernel/qwindow.cpp \ - kernel/qplatformsurface_qpa.cpp \ - kernel/qsurface.cpp -} - win32:HEADERS+=kernel/qwindowdefs_win.h diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 658cdd5..89f8d0a 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -19,7 +19,6 @@ load(qt_module_config) HEADERS += $$QT_SOURCE_TREE/src/opengl/qtopenglversion.h -!win32:!embedded:!mac:!qpa:CONFIG += x11 contains(QT_CONFIG, opengl):CONFIG += opengl contains(QT_CONFIG, opengles1):CONFIG += opengles1 contains(QT_CONFIG, opengles2):CONFIG += opengles2 -- 2.7.4