Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: Reilly Brogan <reilly@reillybrogan.com>
- Date: Mon, 25 Mar 2024 10:33:35 -0500
- Subject: [PATCH] Support Wayland appId
- ---
- lcl/interfaces/qt5/cbindings/qt5.pas | 1 +
- lcl/interfaces/qt5/cbindings/src/qguiapplication_c.cpp | 7 +++++++
- lcl/interfaces/qt5/cbindings/src/qguiapplication_c.h | 1 +
- lcl/interfaces/qt5/qt56.pas | 1 +
- lcl/interfaces/qt6/cbindings/src/qguiapplication_c.cpp | 7 +++++++
- lcl/interfaces/qt6/cbindings/src/qguiapplication_c.h | 1 +
- lcl/interfaces/qt6/qt62.pas | 1 +
- 7 files changed, 19 insertions(+)
- diff --git a/lcl/interfaces/qt5/cbindings/qt5.pas b/lcl/interfaces/qt5/cbindings/qt5.pas
- index f7a35f5a08..ad0951f0eb 100644
- --- a/lcl/interfaces/qt5/cbindings/qt5.pas
- +++ b/lcl/interfaces/qt5/cbindings/qt5.pas
- @@ -5475,6 +5475,7 @@ function QGuiApplication_Create(argc: PInteger; argv: PPAnsiChar; AnonParam3: In
- procedure QGuiApplication_Destroy(handle: QGuiApplicationH); cdecl; external Qt5PasLib name 'QGuiApplication_Destroy';
- procedure QGuiApplication_setApplicationDisplayName(name: PWideString); cdecl; external Qt5PasLib name 'QGuiApplication_setApplicationDisplayName';
- procedure QGuiApplication_applicationDisplayName(retval: PWideString); cdecl; external Qt5PasLib name 'QGuiApplication_applicationDisplayName';
- +procedure QGuiApplication_setDesktopFileName(name: PWideString); cdecl; external Qt5PasLib name 'QGuiApplication_setDesktopFileName';
- procedure QGuiApplication_allWindows(retval: PPtrIntArray); cdecl; external Qt5PasLib name 'QGuiApplication_allWindows';
- procedure QGuiApplication_topLevelWindows(retval: PPtrIntArray); cdecl; external Qt5PasLib name 'QGuiApplication_topLevelWindows';
- function QGuiApplication_topLevelAt(pos: PQtPoint): QWindowH; cdecl; external Qt5PasLib name 'QGuiApplication_topLevelAt';
- diff --git a/lcl/interfaces/qt5/cbindings/src/qguiapplication_c.cpp b/lcl/interfaces/qt5/cbindings/src/qguiapplication_c.cpp
- index d92049c2c1..d702bd71d6 100644
- --- a/lcl/interfaces/qt5/cbindings/src/qguiapplication_c.cpp
- +++ b/lcl/interfaces/qt5/cbindings/src/qguiapplication_c.cpp
- @@ -35,6 +35,13 @@ void QGuiApplication_applicationDisplayName(PWideString retval)
- copyQStringToPWideString(t_retval, retval);
- }
- +void QGuiApplication_setDesktopFileName(PWideString name)
- +{
- + QString t_name;
- + copyPWideStringToQString(name, t_name);
- + QGuiApplication::setDesktopFileName(t_name);
- +}
- +
- Qt::ApplicationState QGuiApplication_applicationState()
- {
- return (Qt::ApplicationState) QGuiApplication::applicationState();
- diff --git a/lcl/interfaces/qt5/cbindings/src/qguiapplication_c.h b/lcl/interfaces/qt5/cbindings/src/qguiapplication_c.h
- index 0587d8a371..c4669c05cd 100644
- --- a/lcl/interfaces/qt5/cbindings/src/qguiapplication_c.h
- +++ b/lcl/interfaces/qt5/cbindings/src/qguiapplication_c.h
- @@ -18,6 +18,7 @@
- C_EXPORT QGuiApplicationH QGuiApplication_Create(int* argc, char** argv, int AnonParam3);
- C_EXPORT void QGuiApplication_Destroy(QGuiApplicationH handle);
- C_EXPORT void QGuiApplication_setApplicationDisplayName(PWideString name);
- +C_EXPORT void QGuiApplication_setDesktopFileName(PWideString name);
- C_EXPORT void QGuiApplication_applicationDisplayName(PWideString retval);
- C_EXPORT Qt::ApplicationState QGuiApplication_applicationState();
- C_EXPORT void QGuiApplication_allWindows(PPtrIntArray retval);
- diff --git a/lcl/interfaces/qt5/qt56.pas b/lcl/interfaces/qt5/qt56.pas
- index cafda5eebb..0b0e3eed98 100644
- --- a/lcl/interfaces/qt5/qt56.pas
- +++ b/lcl/interfaces/qt5/qt56.pas
- @@ -5505,6 +5505,7 @@ function QGuiApplication_Create(argc: PInteger; argv: PPAnsiChar; AnonParam3: In
- procedure QGuiApplication_Destroy(handle: QGuiApplicationH); cdecl; external Qt5PasLib name 'QGuiApplication_Destroy';
- procedure QGuiApplication_setApplicationDisplayName(name: PWideString); cdecl; external Qt5PasLib name 'QGuiApplication_setApplicationDisplayName';
- procedure QGuiApplication_applicationDisplayName(retval: PWideString); cdecl; external Qt5PasLib name 'QGuiApplication_applicationDisplayName';
- +procedure QGuiApplication_setDesktopFileName(name: PWideString); cdecl; external Qt5PasLib name 'QGuiApplication_setDesktopFileName';
- function QGuiApplication_applicationState(): QtApplicationState; cdecl; external Qt5PasLib name 'QGuiApplication_applicationState';
- procedure QGuiApplication_allWindows(retval: PPtrIntArray); cdecl; external Qt5PasLib name 'QGuiApplication_allWindows';
- procedure QGuiApplication_topLevelWindows(retval: PPtrIntArray); cdecl; external Qt5PasLib name 'QGuiApplication_topLevelWindows';
- diff --git a/lcl/interfaces/qt6/cbindings/src/qguiapplication_c.cpp b/lcl/interfaces/qt6/cbindings/src/qguiapplication_c.cpp
- index 757f41fd9f..e25fb3695e 100644
- --- a/lcl/interfaces/qt6/cbindings/src/qguiapplication_c.cpp
- +++ b/lcl/interfaces/qt6/cbindings/src/qguiapplication_c.cpp
- @@ -35,6 +35,13 @@ void QGuiApplication_applicationDisplayName(PWideString retval)
- copyQStringToPWideString(t_retval, retval);
- }
- +void QGuiApplication_setDesktopFileName(PWideString name)
- +{
- + QString t_name;
- + copyPWideStringToQString(name, t_name);
- + QGuiApplication::setDesktopFileName(t_name);
- +}
- +
- void QGuiApplication_allWindows(PPtrIntArray retval)
- {
- QWindowList t_retval;
- diff --git a/lcl/interfaces/qt6/cbindings/src/qguiapplication_c.h b/lcl/interfaces/qt6/cbindings/src/qguiapplication_c.h
- index dc72f0886f..25a021b1a3 100644
- --- a/lcl/interfaces/qt6/cbindings/src/qguiapplication_c.h
- +++ b/lcl/interfaces/qt6/cbindings/src/qguiapplication_c.h
- @@ -19,6 +19,7 @@ C_EXPORT QGuiApplicationH QGuiApplication_Create(int* argc, char** argv, int Ano
- C_EXPORT void QGuiApplication_Destroy(QGuiApplicationH handle);
- C_EXPORT void QGuiApplication_setApplicationDisplayName(PWideString name);
- C_EXPORT void QGuiApplication_applicationDisplayName(PWideString retval);
- +C_EXPORT void QGuiApplication_setDesktopFileName(PWideString name);
- C_EXPORT void QGuiApplication_allWindows(PPtrIntArray retval);
- C_EXPORT void QGuiApplication_topLevelWindows(PPtrIntArray retval);
- C_EXPORT QWindowH QGuiApplication_topLevelAt(const QPointH pos);
- diff --git a/lcl/interfaces/qt6/qt62.pas b/lcl/interfaces/qt6/qt62.pas
- index 9def6242a2..0de7cf3fba 100644
- --- a/lcl/interfaces/qt6/qt62.pas
- +++ b/lcl/interfaces/qt6/qt62.pas
- @@ -5512,6 +5512,7 @@ function QGuiApplication_Create(argc: PInteger; argv: PPAnsiChar; AnonParam3: In
- procedure QGuiApplication_Destroy(handle: QGuiApplicationH); cdecl; external Qt6PasLib name 'QGuiApplication_Destroy';
- procedure QGuiApplication_setApplicationDisplayName(name: PWideString); cdecl; external Qt6PasLib name 'QGuiApplication_setApplicationDisplayName';
- procedure QGuiApplication_applicationDisplayName(retval: PWideString); cdecl; external Qt6PasLib name 'QGuiApplication_applicationDisplayName';
- +procedure QGuiApplication_setDesktopFileName(name: PWideString); cdecl; external Qt6PasLib name 'QGuiApplication_setDesktopFileName';
- procedure QGuiApplication_allWindows(retval: PPtrIntArray); cdecl; external Qt6PasLib name 'QGuiApplication_allWindows';
- procedure QGuiApplication_topLevelWindows(retval: PPtrIntArray); cdecl; external Qt6PasLib name 'QGuiApplication_topLevelWindows';
- function QGuiApplication_topLevelAt(pos: PQtPoint): QWindowH; cdecl; external Qt6PasLib name 'QGuiApplication_topLevelAt';
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement