mirror/layer-shell-qt
1
0
Fork 0
mirror of https://invent.kde.org/plasma/layer-shell-qt.git synced 2026-01-04 06:12:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate Shell::useLayerShell()

Browse Source 
it's not needed since Qt 6.5 and can potentially leak the environment
variable.
This commit is contained in:
David Redondo
2025-12-18 15:20:57 +01:00
parent b9e1260949
commit 9ddf87a444
4 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -32,6 +32,7 @@ include(KDEClangFormat)
include(ECMQtDeclareLoggingCategory) include(ECMQtDeclareLoggingCategory)
include(ECMQmlModule) include(ECMQmlModule)
include(KDEGitCommitHooks) include(KDEGitCommitHooks)
include(ECMGenerateExportHeader)
find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient Qml) find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient Qml)

4
src/CMakeLists.txt
View File

@ -64,10 +64,12 @@ ecm_generate_headers(LayerShellQt_HEADERS
) )
generate_export_header(LayerShellQtInterface ecm_generate_export_header(LayerShellQtInterface
BASE_NAME LayerShellQtInterface BASE_NAME LayerShellQtInterface
EXPORT_MACRO_NAME LAYERSHELLQT_EXPORT EXPORT_MACRO_NAME LAYERSHELLQT_EXPORT
EXPORT_FILE_NAME LayerShellQt/layershellqt_export.h EXPORT_FILE_NAME LayerShellQt/layershellqt_export.h
VERSION ${LAYERSHELLQT_VERSION}
DEPRECATION_VERSIONS 6.6
) )
install(TARGETS layer-shell install(TARGETS layer-shell

4
src/interfaces/shell.cpp
View File

@ -5,6 +5,9 @@
*/ */
#include "shell.h" #include "shell.h"
#if LAYERSHELLQTINTERFACE_BUILD_DEPRECATED_SINCE(6, 6)
#include <QByteArray> #include <QByteArray>
#include <layershellqt_logging.h> #include <layershellqt_logging.h>
#include <qglobal.h> #include <qglobal.h>
@ -18,3 +21,4 @@ void Shell::useLayerShell()
qCDebug(LAYERSHELLQT) << "Unable to set QT_WAYLAND_SHELL_INTEGRATION=layer-shell"; qCDebug(LAYERSHELLQT) << "Unable to set QT_WAYLAND_SHELL_INTEGRATION=layer-shell";
} }
} }
#endif

6
src/interfaces/shell.h
View File

@ -8,7 +8,9 @@
#define LAYERSHELLQTSHELL_H #define LAYERSHELLQTSHELL_H
#include "layershellqt_export.h" #include "layershellqt_export.h"
#include "window.h"
#if LAYERSHELLQTINTERFACE_ENABLE_DEPRECATED_SINCE(6, 6)
#include <QString> #include <QString>
namespace LayerShellQt namespace LayerShellQt
@ -19,9 +21,11 @@ namespace LayerShellQt
class LAYERSHELLQT_EXPORT Shell class LAYERSHELLQT_EXPORT Shell
{ {
public: public:
LAYERSHELLQTINTERFACE_DEPRECATED_VERSION(6, 6, "Calling useLayerShell is not needed since Qt 6.5")
static void useLayerShell(); static void useLayerShell();
}; };
} }
#endif
#endif #endif