diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/accessible/accessible.pri | 2 | ||||
-rw-r--r-- | src/gui/accessible/qplatformaccessibility.cpp (renamed from src/gui/accessible/qplatformaccessibility_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/kernel.pri | 50 | ||||
-rw-r--r-- | src/gui/kernel/qgenericplugin.cpp (renamed from src/gui/kernel/qgenericplugin_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qgenericpluginfactory.cpp (renamed from src/gui/kernel/qgenericpluginfactory_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformclipboard.cpp (renamed from src/gui/kernel/qplatformclipboard_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformcursor.cpp (renamed from src/gui/kernel/qplatformcursor_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformdialoghelper.cpp (renamed from src/gui/kernel/qplatformdialoghelper_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformdrag.cpp (renamed from src/gui/kernel/qplatformdrag_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatforminputcontext.cpp (renamed from src/gui/kernel/qplatforminputcontext_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatforminputcontextfactory.cpp (renamed from src/gui/kernel/qplatforminputcontextfactory_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatforminputcontextplugin.cpp (renamed from src/gui/kernel/qplatforminputcontextplugin_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformintegration.cpp (renamed from src/gui/kernel/qplatformintegration_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformintegrationfactory.cpp (renamed from src/gui/kernel/qplatformintegrationfactory_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformintegrationplugin.cpp (renamed from src/gui/kernel/qplatformintegrationplugin_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformnativeinterface.cpp (renamed from src/gui/kernel/qplatformnativeinterface_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformopenglcontext.cpp (renamed from src/gui/kernel/qplatformopenglcontext_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformscreen.cpp (renamed from src/gui/kernel/qplatformscreen_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformscreenpageflipper.cpp (renamed from src/gui/kernel/qplatformscreenpageflipper_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformservices.cpp (renamed from src/gui/kernel/qplatformservices_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformsharedgraphicscache.cpp (renamed from src/gui/kernel/qplatformsharedgraphicscache_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformsurface.cpp (renamed from src/gui/kernel/qplatformsurface_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformtheme.cpp (renamed from src/gui/kernel/qplatformtheme_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformthemefactory.cpp (renamed from src/gui/kernel/qplatformthemefactory_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformthemeplugin.cpp (renamed from src/gui/kernel/qplatformthemeplugin_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qplatformwindow.cpp (renamed from src/gui/kernel/qplatformwindow_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qsessionmanager.cpp (renamed from src/gui/kernel/qsessionmanager_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qwindowsysteminterface.cpp (renamed from src/gui/kernel/qwindowsysteminterface_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/painting/painting.pri | 2 | ||||
-rw-r--r-- | src/gui/painting/qplatformbackingstore.cpp (renamed from src/gui/painting/qplatformbackingstore_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/text/qplatformfontdatabase.cpp (renamed from src/gui/text/qplatformfontdatabase_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/gui/text/text.pri | 2 | ||||
-rw-r--r-- | src/platformsupport/eventdispatchers/eventdispatchers.pri | 2 | ||||
-rw-r--r-- | src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp (renamed from src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/printsupport/kernel/kernel.pri | 2 | ||||
-rw-r--r-- | src/printsupport/kernel/qplatformprintersupport.cpp (renamed from src/printsupport/kernel/qplatformprintersupport_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/widgets/kernel/kernel.pri | 2 | ||||
-rw-r--r-- | src/widgets/kernel/qwidgetwindow.cpp (renamed from src/widgets/kernel/qwidgetwindow_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/widgets/util/qcolormap.cpp (renamed from src/widgets/util/qcolormap_qpa.cpp) | 0 | ||||
-rw-r--r-- | src/widgets/util/util.pri | 2 |
40 files changed, 32 insertions, 32 deletions
diff --git a/src/gui/accessible/accessible.pri b/src/gui/accessible/accessible.pri index abffa2ade8..7c8e81812a 100644 --- a/src/gui/accessible/accessible.pri +++ b/src/gui/accessible/accessible.pri @@ -12,7 +12,7 @@ contains(QT_CONFIG, accessibility) { accessible/qaccessible2.cpp \ accessible/qaccessibleobject.cpp \ accessible/qaccessibleplugin.cpp \ - accessible/qplatformaccessibility_qpa.cpp + accessible/qplatformaccessibility.cpp HEADERS += accessible/qaccessiblebridge.h SOURCES += accessible/qaccessiblebridge.cpp diff --git a/src/gui/accessible/qplatformaccessibility_qpa.cpp b/src/gui/accessible/qplatformaccessibility.cpp index dba5475995..dba5475995 100644 --- a/src/gui/accessible/qplatformaccessibility_qpa.cpp +++ b/src/gui/accessible/qplatformaccessibility.cpp diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index efa79b5cc0..bf798372ae 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -66,29 +66,29 @@ HEADERS += \ SOURCES += \ kernel/qclipboard_qpa.cpp \ kernel/qcursor_qpa.cpp \ - kernel/qgenericpluginfactory_qpa.cpp \ - kernel/qgenericplugin_qpa.cpp \ - kernel/qwindowsysteminterface_qpa.cpp \ - kernel/qplatforminputcontextfactory_qpa.cpp \ - kernel/qplatforminputcontextplugin_qpa.cpp \ - kernel/qplatforminputcontext_qpa.cpp \ - kernel/qplatformintegration_qpa.cpp \ - kernel/qplatformdrag_qpa.cpp \ - kernel/qplatformscreen_qpa.cpp \ - kernel/qplatformintegrationfactory_qpa.cpp \ - kernel/qplatformintegrationplugin_qpa.cpp \ - kernel/qplatformtheme_qpa.cpp \ - kernel/qplatformthemefactory_qpa.cpp \ - kernel/qplatformthemeplugin_qpa.cpp \ - kernel/qplatformwindow_qpa.cpp \ - kernel/qplatformcursor_qpa.cpp \ - kernel/qplatformclipboard_qpa.cpp \ - kernel/qplatformnativeinterface_qpa.cpp \ - kernel/qsessionmanager_qpa.cpp \ + kernel/qgenericpluginfactory.cpp \ + kernel/qgenericplugin.cpp \ + kernel/qwindowsysteminterface.cpp \ + kernel/qplatforminputcontextfactory.cpp \ + kernel/qplatforminputcontextplugin.cpp \ + kernel/qplatforminputcontext.cpp \ + kernel/qplatformintegration.cpp \ + kernel/qplatformdrag.cpp \ + kernel/qplatformscreen.cpp \ + kernel/qplatformintegrationfactory.cpp \ + kernel/qplatformintegrationplugin.cpp \ + kernel/qplatformtheme.cpp \ + kernel/qplatformthemefactory.cpp \ + kernel/qplatformthemeplugin.cpp \ + kernel/qplatformwindow.cpp \ + kernel/qplatformcursor.cpp \ + kernel/qplatformclipboard.cpp \ + kernel/qplatformnativeinterface.cpp \ + kernel/qsessionmanager.cpp \ kernel/qsurfaceformat.cpp \ kernel/qguiapplication.cpp \ kernel/qwindow.cpp \ - kernel/qplatformsurface_qpa.cpp \ + kernel/qplatformsurface.cpp \ kernel/qsurface.cpp \ kernel/qclipboard.cpp \ kernel/qcursor.cpp \ @@ -105,10 +105,10 @@ SOURCES += \ kernel/qshortcutmap.cpp \ kernel/qstylehints.cpp \ kernel/qtouchdevice.cpp \ - kernel/qplatformsharedgraphicscache_qpa.cpp \ - kernel/qplatformdialoghelper_qpa.cpp \ - kernel/qplatformservices_qpa.cpp \ - kernel/qplatformscreenpageflipper_qpa.cpp + kernel/qplatformsharedgraphicscache.cpp \ + kernel/qplatformdialoghelper.cpp \ + kernel/qplatformservices.cpp \ + kernel/qplatformscreenpageflipper.cpp contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) { HEADERS += \ @@ -117,7 +117,7 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) { kernel/qopenglcontext_p.h SOURCES += \ - kernel/qplatformopenglcontext_qpa.cpp \ + kernel/qplatformopenglcontext.cpp \ kernel/qopenglcontext.cpp } diff --git a/src/gui/kernel/qgenericplugin_qpa.cpp b/src/gui/kernel/qgenericplugin.cpp index 4cd12d068c..4cd12d068c 100644 --- a/src/gui/kernel/qgenericplugin_qpa.cpp +++ b/src/gui/kernel/qgenericplugin.cpp diff --git a/src/gui/kernel/qgenericpluginfactory_qpa.cpp b/src/gui/kernel/qgenericpluginfactory.cpp index 663b88e10d..663b88e10d 100644 --- a/src/gui/kernel/qgenericpluginfactory_qpa.cpp +++ b/src/gui/kernel/qgenericpluginfactory.cpp diff --git a/src/gui/kernel/qplatformclipboard_qpa.cpp b/src/gui/kernel/qplatformclipboard.cpp index 5a29606391..5a29606391 100644 --- a/src/gui/kernel/qplatformclipboard_qpa.cpp +++ b/src/gui/kernel/qplatformclipboard.cpp diff --git a/src/gui/kernel/qplatformcursor_qpa.cpp b/src/gui/kernel/qplatformcursor.cpp index 40b7967af7..40b7967af7 100644 --- a/src/gui/kernel/qplatformcursor_qpa.cpp +++ b/src/gui/kernel/qplatformcursor.cpp diff --git a/src/gui/kernel/qplatformdialoghelper_qpa.cpp b/src/gui/kernel/qplatformdialoghelper.cpp index f71c5e58de..f71c5e58de 100644 --- a/src/gui/kernel/qplatformdialoghelper_qpa.cpp +++ b/src/gui/kernel/qplatformdialoghelper.cpp diff --git a/src/gui/kernel/qplatformdrag_qpa.cpp b/src/gui/kernel/qplatformdrag.cpp index 068dfabf7b..068dfabf7b 100644 --- a/src/gui/kernel/qplatformdrag_qpa.cpp +++ b/src/gui/kernel/qplatformdrag.cpp diff --git a/src/gui/kernel/qplatforminputcontext_qpa.cpp b/src/gui/kernel/qplatforminputcontext.cpp index 0a8633b61d..0a8633b61d 100644 --- a/src/gui/kernel/qplatforminputcontext_qpa.cpp +++ b/src/gui/kernel/qplatforminputcontext.cpp diff --git a/src/gui/kernel/qplatforminputcontextfactory_qpa.cpp b/src/gui/kernel/qplatforminputcontextfactory.cpp index 595c3cc1f0..595c3cc1f0 100644 --- a/src/gui/kernel/qplatforminputcontextfactory_qpa.cpp +++ b/src/gui/kernel/qplatforminputcontextfactory.cpp diff --git a/src/gui/kernel/qplatforminputcontextplugin_qpa.cpp b/src/gui/kernel/qplatforminputcontextplugin.cpp index 670bfd0de5..670bfd0de5 100644 --- a/src/gui/kernel/qplatforminputcontextplugin_qpa.cpp +++ b/src/gui/kernel/qplatforminputcontextplugin.cpp diff --git a/src/gui/kernel/qplatformintegration_qpa.cpp b/src/gui/kernel/qplatformintegration.cpp index 3021f6373e..3021f6373e 100644 --- a/src/gui/kernel/qplatformintegration_qpa.cpp +++ b/src/gui/kernel/qplatformintegration.cpp diff --git a/src/gui/kernel/qplatformintegrationfactory_qpa.cpp b/src/gui/kernel/qplatformintegrationfactory.cpp index 886f50bdc6..886f50bdc6 100644 --- a/src/gui/kernel/qplatformintegrationfactory_qpa.cpp +++ b/src/gui/kernel/qplatformintegrationfactory.cpp diff --git a/src/gui/kernel/qplatformintegrationplugin_qpa.cpp b/src/gui/kernel/qplatformintegrationplugin.cpp index d4debd1f3a..d4debd1f3a 100644 --- a/src/gui/kernel/qplatformintegrationplugin_qpa.cpp +++ b/src/gui/kernel/qplatformintegrationplugin.cpp diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.cpp b/src/gui/kernel/qplatformnativeinterface.cpp index f0bd3f0658..f0bd3f0658 100644 --- a/src/gui/kernel/qplatformnativeinterface_qpa.cpp +++ b/src/gui/kernel/qplatformnativeinterface.cpp diff --git a/src/gui/kernel/qplatformopenglcontext_qpa.cpp b/src/gui/kernel/qplatformopenglcontext.cpp index d38a5864d6..d38a5864d6 100644 --- a/src/gui/kernel/qplatformopenglcontext_qpa.cpp +++ b/src/gui/kernel/qplatformopenglcontext.cpp diff --git a/src/gui/kernel/qplatformscreen_qpa.cpp b/src/gui/kernel/qplatformscreen.cpp index d946e4f240..d946e4f240 100644 --- a/src/gui/kernel/qplatformscreen_qpa.cpp +++ b/src/gui/kernel/qplatformscreen.cpp diff --git a/src/gui/kernel/qplatformscreenpageflipper_qpa.cpp b/src/gui/kernel/qplatformscreenpageflipper.cpp index babecb061f..babecb061f 100644 --- a/src/gui/kernel/qplatformscreenpageflipper_qpa.cpp +++ b/src/gui/kernel/qplatformscreenpageflipper.cpp diff --git a/src/gui/kernel/qplatformservices_qpa.cpp b/src/gui/kernel/qplatformservices.cpp index 9a1ea404ef..9a1ea404ef 100644 --- a/src/gui/kernel/qplatformservices_qpa.cpp +++ b/src/gui/kernel/qplatformservices.cpp diff --git a/src/gui/kernel/qplatformsharedgraphicscache_qpa.cpp b/src/gui/kernel/qplatformsharedgraphicscache.cpp index e38ece3cba..e38ece3cba 100644 --- a/src/gui/kernel/qplatformsharedgraphicscache_qpa.cpp +++ b/src/gui/kernel/qplatformsharedgraphicscache.cpp diff --git a/src/gui/kernel/qplatformsurface_qpa.cpp b/src/gui/kernel/qplatformsurface.cpp index 464c971b98..464c971b98 100644 --- a/src/gui/kernel/qplatformsurface_qpa.cpp +++ b/src/gui/kernel/qplatformsurface.cpp diff --git a/src/gui/kernel/qplatformtheme_qpa.cpp b/src/gui/kernel/qplatformtheme.cpp index 1038eb2826..1038eb2826 100644 --- a/src/gui/kernel/qplatformtheme_qpa.cpp +++ b/src/gui/kernel/qplatformtheme.cpp diff --git a/src/gui/kernel/qplatformthemefactory_qpa.cpp b/src/gui/kernel/qplatformthemefactory.cpp index cc203991db..cc203991db 100644 --- a/src/gui/kernel/qplatformthemefactory_qpa.cpp +++ b/src/gui/kernel/qplatformthemefactory.cpp diff --git a/src/gui/kernel/qplatformthemeplugin_qpa.cpp b/src/gui/kernel/qplatformthemeplugin.cpp index 74cbb1a073..74cbb1a073 100644 --- a/src/gui/kernel/qplatformthemeplugin_qpa.cpp +++ b/src/gui/kernel/qplatformthemeplugin.cpp diff --git a/src/gui/kernel/qplatformwindow_qpa.cpp b/src/gui/kernel/qplatformwindow.cpp index 3c2246cf00..3c2246cf00 100644 --- a/src/gui/kernel/qplatformwindow_qpa.cpp +++ b/src/gui/kernel/qplatformwindow.cpp diff --git a/src/gui/kernel/qsessionmanager_qpa.cpp b/src/gui/kernel/qsessionmanager.cpp index 2db2e75de9..2db2e75de9 100644 --- a/src/gui/kernel/qsessionmanager_qpa.cpp +++ b/src/gui/kernel/qsessionmanager.cpp diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.cpp b/src/gui/kernel/qwindowsysteminterface.cpp index e884d7caf9..e884d7caf9 100644 --- a/src/gui/kernel/qwindowsysteminterface_qpa.cpp +++ b/src/gui/kernel/qwindowsysteminterface.cpp diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index 6db0d341ec..cace864906 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -83,7 +83,7 @@ SOURCES += \ painting/qstroker.cpp \ painting/qtextureglyphcache.cpp \ painting/qtransform.cpp \ - painting/qplatformbackingstore_qpa.cpp \ + painting/qplatformbackingstore.cpp \ painting/qpaintbuffer.cpp \ painting/qpathsimplifier.cpp diff --git a/src/gui/painting/qplatformbackingstore_qpa.cpp b/src/gui/painting/qplatformbackingstore.cpp index 34cda00a6e..34cda00a6e 100644 --- a/src/gui/painting/qplatformbackingstore_qpa.cpp +++ b/src/gui/painting/qplatformbackingstore.cpp diff --git a/src/gui/text/qplatformfontdatabase_qpa.cpp b/src/gui/text/qplatformfontdatabase.cpp index 7e2b890483..7e2b890483 100644 --- a/src/gui/text/qplatformfontdatabase_qpa.cpp +++ b/src/gui/text/qplatformfontdatabase.cpp diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index 4cf58fadcd..fb46642b31 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -86,7 +86,7 @@ contains(QT_CONFIG, directwrite) { SOURCES += \ text/qfont_qpa.cpp \ text/qfontengine_qpa.cpp \ - text/qplatformfontdatabase_qpa.cpp \ + text/qplatformfontdatabase.cpp \ text/qrawfont_qpa.cpp HEADERS += \ diff --git a/src/platformsupport/eventdispatchers/eventdispatchers.pri b/src/platformsupport/eventdispatchers/eventdispatchers.pri index 9e6ff282ce..6e16a46b34 100644 --- a/src/platformsupport/eventdispatchers/eventdispatchers.pri +++ b/src/platformsupport/eventdispatchers/eventdispatchers.pri @@ -1,6 +1,6 @@ unix { SOURCES +=\ - $$PWD/qunixeventdispatcher_qpa.cpp\ + $$PWD/qunixeventdispatcher.cpp\ $$PWD/qgenericunixeventdispatcher.cpp\ HEADERS +=\ diff --git a/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa.cpp b/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp index 985b62e0a5..985b62e0a5 100644 --- a/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa.cpp +++ b/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp diff --git a/src/printsupport/kernel/kernel.pri b/src/printsupport/kernel/kernel.pri index d3c266ca2d..5f14c28616 100644 --- a/src/printsupport/kernel/kernel.pri +++ b/src/printsupport/kernel/kernel.pri @@ -17,7 +17,7 @@ SOURCES += \ $$PWD/qprinter.cpp \ $$PWD/qprinterinfo.cpp \ $$PWD/qplatformprintplugin.cpp \ - $$PWD/qplatformprintersupport_qpa.cpp + $$PWD/qplatformprintersupport.cpp win32 { HEADERS += \ diff --git a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp b/src/printsupport/kernel/qplatformprintersupport.cpp index b74a84f9c6..b74a84f9c6 100644 --- a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp +++ b/src/printsupport/kernel/qplatformprintersupport.cpp diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri index ac363c5f7a..b2f05e3cab 100644 --- a/src/widgets/kernel/kernel.pri +++ b/src/widgets/kernel/kernel.pri @@ -65,7 +65,7 @@ SOURCES += \ kernel/qapplication_qpa.cpp \ kernel/qdesktopwidget_qpa.cpp \ kernel/qwidget_qpa.cpp \ - kernel/qwidgetwindow_qpa.cpp + kernel/qwidgetwindow.cpp # TODO diff --git a/src/widgets/kernel/qwidgetwindow_qpa.cpp b/src/widgets/kernel/qwidgetwindow.cpp index 1b076d1801..1b076d1801 100644 --- a/src/widgets/kernel/qwidgetwindow_qpa.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp diff --git a/src/widgets/util/qcolormap_qpa.cpp b/src/widgets/util/qcolormap.cpp index 8c24a25b66..8c24a25b66 100644 --- a/src/widgets/util/qcolormap_qpa.cpp +++ b/src/widgets/util/qcolormap.cpp diff --git a/src/widgets/util/util.pri b/src/widgets/util/util.pri index 958958f469..08574ddd56 100644 --- a/src/widgets/util/util.pri +++ b/src/widgets/util/util.pri @@ -18,7 +18,7 @@ HEADERS += \ SOURCES += \ util/qsystemtrayicon.cpp \ - util/qcolormap_qpa.cpp \ + util/qcolormap.cpp \ util/qcompleter.cpp \ util/qscroller.cpp \ util/qscrollerproperties.cpp \ |