1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename QtGui native interface implementation files

Browse Source 
Follows the naming convention used by the plugins as well.

Change-Id: Icba62fc2aaa5acf0ab3c88599a63aab1f530a2ab
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-10-08 12:07:26 +02:00
parent 75b8c4d75e
commit 2b14556a96
10 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/.prev_CMakeLists.txt
View File

@ -277,7 +277,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_opengl
qt_internal_extend_target(Gui CONDITION MACOS qt_internal_extend_target(Gui CONDITION MACOS
SOURCES SOURCES
platform/macos/qcocoaplatforminterface.mm platform/macos/qcocoanativeinterface.mm
LIBRARIES LIBRARIES
${FWAppKit} ${FWAppKit}
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
@ -312,7 +312,7 @@ qt_internal_extend_target(Gui CONDITION WIN32
kernel/qwindowdefs_win.h kernel/qwindowdefs_win.h
platform/windows/qwindowsguieventdispatcher.cpp platform/windows/qwindowsguieventdispatcher_p.h platform/windows/qwindowsguieventdispatcher.cpp platform/windows/qwindowsguieventdispatcher_p.h
platform/windows/qwindowsmime_p.h platform/windows/qwindowsmime_p.h
platform/windows/qwindowsplatforminterface.cpp platform/windows/qwindowsnativeinterface.cpp
rhi/qrhid3d11.cpp rhi/qrhid3d11_p.h rhi/qrhid3d11.cpp rhi/qrhid3d11_p.h
rhi/qrhid3d11_p_p.h rhi/qrhid3d11_p_p.h
text/windows/qwindowsfontdatabase.cpp text/windows/qwindowsfontdatabase_p.h text/windows/qwindowsfontdatabase.cpp text/windows/qwindowsfontdatabase_p.h
@ -515,7 +515,7 @@ endif()
qt_internal_extend_target(Gui CONDITION ANDROID qt_internal_extend_target(Gui CONDITION ANDROID
SOURCES 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) 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/qgenericunixeventdispatcher.cpp platform/unix/qgenericunixeventdispatcher_p.h
platform/unix/qunixeventdispatcher.cpp platform/unix/qunixeventdispatcher.cpp
platform/unix/qunixeventdispatcher_qpa_p.h 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 qt_internal_extend_target(Gui CONDITION QT_FEATURE_glib AND UNIX

13
src/gui/CMakeLists.txt
View File

@ -352,17 +352,12 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_opengl
rhi/qrhigles2_p_p.h 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: #### Keys ignored in scope 2:.:.:gui.pro:QT_FEATURE_opengl:
# MODULE_CONFIG = "opengl" # MODULE_CONFIG = "opengl"
qt_internal_extend_target(Gui CONDITION MACOS qt_internal_extend_target(Gui CONDITION MACOS
SOURCES SOURCES
platform/macos/qcocoaplatforminterface.mm platform/macos/qcocoanativeinterface.mm
LIBRARIES LIBRARIES
${FWAppKit} ${FWAppKit}
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
@ -397,7 +392,7 @@ qt_internal_extend_target(Gui CONDITION WIN32
kernel/qwindowdefs_win.h kernel/qwindowdefs_win.h
platform/windows/qwindowsguieventdispatcher.cpp platform/windows/qwindowsguieventdispatcher_p.h platform/windows/qwindowsguieventdispatcher.cpp platform/windows/qwindowsguieventdispatcher_p.h
platform/windows/qwindowsmime_p.h platform/windows/qwindowsmime_p.h
platform/windows/qwindowsplatforminterface.cpp platform/windows/qwindowsnativeinterface.cpp
rhi/qrhid3d11.cpp rhi/qrhid3d11_p.h rhi/qrhid3d11.cpp rhi/qrhid3d11_p.h
rhi/qrhid3d11_p_p.h rhi/qrhid3d11_p_p.h
text/windows/qwindowsfontdatabase.cpp text/windows/qwindowsfontdatabase_p.h text/windows/qwindowsfontdatabase.cpp text/windows/qwindowsfontdatabase_p.h
@ -618,7 +613,7 @@ endif()
qt_internal_extend_target(Gui CONDITION ANDROID qt_internal_extend_target(Gui CONDITION ANDROID
SOURCES 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 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/qgenericunixeventdispatcher.cpp platform/unix/qgenericunixeventdispatcher_p.h
platform/unix/qunixeventdispatcher.cpp platform/unix/qunixeventdispatcher.cpp
platform/unix/qunixeventdispatcher_qpa_p.h 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 qt_internal_extend_target(Gui CONDITION QT_FEATURE_glib AND UNIX

2
src/gui/platform/android/android.pri
View File

@ -1 +1 @@
SOURCES += $$PWD/qandroidplatforminterface.cpp SOURCES += $$PWD/qandroidnativeinterface.cpp

0
src/gui/platform/android/qandroidplatforminterface.cpp → src/gui/platform/android/qandroidnativeinterface.cpp
View File

2
src/gui/platform/macos/macos.pri
View File

@ -1,4 +1,4 @@
SOURCES += \ SOURCES += \
$$PWD/qcocoaplatforminterface.mm $$PWD/qcocoanativeinterface.mm
LIBS_PRIVATE += -framework AppKit LIBS_PRIVATE += -framework AppKit

0
src/gui/platform/macos/qcocoaplatforminterface.mm → src/gui/platform/macos/qcocoanativeinterface.mm
View File

0
src/gui/platform/unix/qunixplatforminterface.cpp → src/gui/platform/unix/qunixnativeinterface.cpp
View File

2
src/gui/platform/unix/unix.pri
View File

@ -1,7 +1,7 @@
SOURCES += \ SOURCES += \
platform/unix/qunixeventdispatcher.cpp \ platform/unix/qunixeventdispatcher.cpp \
platform/unix/qgenericunixeventdispatcher.cpp \ platform/unix/qgenericunixeventdispatcher.cpp \
platform/unix/qunixplatforminterface.cpp platform/unix/qunixnativeinterface.cpp
HEADERS += \ HEADERS += \
platform/unix/qunixeventdispatcher_qpa_p.h \ platform/unix/qunixeventdispatcher_qpa_p.h \

0
src/gui/platform/windows/qwindowsplatforminterface.cpp → src/gui/platform/windows/qwindowsnativeinterface.cpp
View File

2
src/gui/platform/windows/windows.pri
View File

@ -4,4 +4,4 @@ HEADERS += \
SOURCES += \ SOURCES += \
platform/windows/qwindowsguieventdispatcher.cpp \ platform/windows/qwindowsguieventdispatcher.cpp \
platform/windows/qwindowsplatforminterface.cpp platform/windows/qwindowsnativeinterface.cpp