10 files changed, 12 insertions, 17 deletions
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
index 8f86f91e9c..7f43e1c510 100644
--- a/src/gui/.prev_CMakeLists.txt
+++ b/src/gui/.prev_CMakeLists.txt
@@ -277,7 +277,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_opengl
 
 qt_internal_extend_target(Gui CONDITION MACOS
     SOURCES
-        platform/macos/qcocoaplatforminterface.mm
+        platform/macos/qcocoanativeinterface.mm
     LIBRARIES
         ${FWAppKit}
     PUBLIC_LIBRARIES
@@ -312,7 +312,7 @@ qt_internal_extend_target(Gui CONDITION WIN32
         kernel/qwindowdefs_win.h
         platform/windows/qwindowsguieventdispatcher.cpp platform/windows/qwindowsguieventdispatcher_p.h
         platform/windows/qwindowsmime_p.h
-        platform/windows/qwindowsplatforminterface.cpp
+        platform/windows/qwindowsnativeinterface.cpp
         rhi/qrhid3d11.cpp rhi/qrhid3d11_p.h
         rhi/qrhid3d11_p_p.h
         text/windows/qwindowsfontdatabase.cpp text/windows/qwindowsfontdatabase_p.h
@@ -515,7 +515,7 @@ endif()
 
 qt_internal_extend_target(Gui CONDITION ANDROID
     SOURCES
-        platform/android/qandroidplatforminterface.cpp
+        platform/android/qandroidnativeinterface.cpp
 )
 
 qt_internal_extend_target(Gui CONDITION (NOT (NOT ANDROID)) AND (TEST_architecture_arch STREQUAL arm64 ORTEST_architecture_arch STREQUAL arm)
@@ -781,7 +781,7 @@ qt_internal_extend_target(Gui CONDITION UNIX
         platform/unix/qgenericunixeventdispatcher.cpp platform/unix/qgenericunixeventdispatcher_p.h
         platform/unix/qunixeventdispatcher.cpp
         platform/unix/qunixeventdispatcher_qpa_p.h
-        platform/unix/qunixplatforminterface.cpp
+        platform/unix/qunixnativeinterface.cpp
 )
 
 qt_internal_extend_target(Gui CONDITION QT_FEATURE_glib AND UNIX
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 4633c6e00e..e503eb6a88 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -352,17 +352,12 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_opengl
         rhi/qrhigles2_p_p.h
 )
 
-qt_internal_extend_target(Gui CONDITION ANDROID
-    SOURCES
-        platform/android/qandroidplatforminterface.cpp
-)
-
 #### Keys ignored in scope 2:.:.:gui.pro:QT_FEATURE_opengl:
 # MODULE_CONFIG = "opengl"
 
 qt_internal_extend_target(Gui CONDITION MACOS
     SOURCES
-        platform/macos/qcocoaplatforminterface.mm
+        platform/macos/qcocoanativeinterface.mm
     LIBRARIES
         ${FWAppKit}
     PUBLIC_LIBRARIES
@@ -397,7 +392,7 @@ qt_internal_extend_target(Gui CONDITION WIN32
         kernel/qwindowdefs_win.h
         platform/windows/qwindowsguieventdispatcher.cpp platform/windows/qwindowsguieventdispatcher_p.h
         platform/windows/qwindowsmime_p.h
-        platform/windows/qwindowsplatforminterface.cpp
+        platform/windows/qwindowsnativeinterface.cpp
         rhi/qrhid3d11.cpp rhi/qrhid3d11_p.h
         rhi/qrhid3d11_p_p.h
         text/windows/qwindowsfontdatabase.cpp text/windows/qwindowsfontdatabase_p.h
@@ -618,7 +613,7 @@ endif()
 
 qt_internal_extend_target(Gui CONDITION ANDROID
     SOURCES
-        platform/android/qandroidplatforminterface.cpp
+        platform/android/qandroidnativeinterface.cpp
 )
 
 qt_internal_extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL arm64 OR TEST_architecture_arch STREQUAL arm) # special case
@@ -952,7 +947,7 @@ qt_internal_extend_target(Gui CONDITION UNIX
         platform/unix/qgenericunixeventdispatcher.cpp platform/unix/qgenericunixeventdispatcher_p.h
         platform/unix/qunixeventdispatcher.cpp
         platform/unix/qunixeventdispatcher_qpa_p.h
-        platform/unix/qunixplatforminterface.cpp
+        platform/unix/qunixnativeinterface.cpp
 )
 
 qt_internal_extend_target(Gui CONDITION QT_FEATURE_glib AND UNIX
diff --git a/src/gui/platform/android/android.pri b/src/gui/platform/android/android.pri
index bdaa4b1279..f60cae1011 100644
--- a/src/gui/platform/android/android.pri
+++ b/src/gui/platform/android/android.pri
@@ -1 +1 @@
-SOURCES += $$PWD/qandroidplatforminterface.cpp
+SOURCES += $$PWD/qandroidnativeinterface.cpp
diff --git a/src/gui/platform/android/qandroidplatforminterface.cpp b/src/gui/platform/android/qandroidnativeinterface.cpp
index bdb322add0..bdb322add0 100644
--- a/src/gui/platform/android/qandroidplatforminterface.cpp
+++ b/src/gui/platform/android/qandroidnativeinterface.cpp
diff --git a/src/gui/platform/macos/macos.pri b/src/gui/platform/macos/macos.pri
index f0107c6944..1931507427 100644
--- a/src/gui/platform/macos/macos.pri
+++ b/src/gui/platform/macos/macos.pri
@@ -1,4 +1,4 @@
 SOURCES += \
-    $$PWD/qcocoaplatforminterface.mm
+    $$PWD/qcocoanativeinterface.mm
 
 LIBS_PRIVATE += -framework AppKit
diff --git a/src/gui/platform/macos/qcocoaplatforminterface.mm b/src/gui/platform/macos/qcocoanativeinterface.mm
index c075a07e66..c075a07e66 100644
--- a/src/gui/platform/macos/qcocoaplatforminterface.mm
+++ b/src/gui/platform/macos/qcocoanativeinterface.mm
diff --git a/src/gui/platform/unix/qunixplatforminterface.cpp b/src/gui/platform/unix/qunixnativeinterface.cpp
index 378282936e..378282936e 100644
--- a/src/gui/platform/unix/qunixplatforminterface.cpp
+++ b/src/gui/platform/unix/qunixnativeinterface.cpp
diff --git a/src/gui/platform/unix/unix.pri b/src/gui/platform/unix/unix.pri
index a322e2ae1a..0e320650fd 100644
--- a/src/gui/platform/unix/unix.pri
+++ b/src/gui/platform/unix/unix.pri
@@ -1,7 +1,7 @@
 SOURCES += \
     platform/unix/qunixeventdispatcher.cpp \
     platform/unix/qgenericunixeventdispatcher.cpp \
-    platform/unix/qunixplatforminterface.cpp
+    platform/unix/qunixnativeinterface.cpp
 
 HEADERS += \
     platform/unix/qunixeventdispatcher_qpa_p.h \
diff --git a/src/gui/platform/windows/qwindowsplatforminterface.cpp b/src/gui/platform/windows/qwindowsnativeinterface.cpp
index 950c86d7fb..950c86d7fb 100644
--- a/src/gui/platform/windows/qwindowsplatforminterface.cpp
+++ b/src/gui/platform/windows/qwindowsnativeinterface.cpp
diff --git a/src/gui/platform/windows/windows.pri b/src/gui/platform/windows/windows.pri
index 94a6a2ff41..9155362d1d 100644
--- a/src/gui/platform/windows/windows.pri
+++ b/src/gui/platform/windows/windows.pri
@@ -4,4 +4,4 @@ HEADERS += \
 
 SOURCES += \
     platform/windows/qwindowsguieventdispatcher.cpp \
-    platform/windows/qwindowsplatforminterface.cpp
+    platform/windows/qwindowsnativeinterface.cpp