diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-07-09 15:28:29 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-07-21 23:22:46 +0200 |
| commit | d3c6ac6d0f23df56644008ccb6aa2c8fa37ab1b5 (patch) | |
| tree | 8f5e5a004c937d5a85fd66ff72834a977b645ace /RepositoryExternal.mk | |
| parent | ofz#15993 Timeout (diff) | |
| download | core-d3c6ac6d0f23df56644008ccb6aa2c8fa37ab1b5.tar.gz core-d3c6ac6d0f23df56644008ccb6aa2c8fa37ab1b5.zip | |
tdf#125922 rename kde5 to kf5 + plasma5
Just as the gtk3 plugin isn't named GNOME, rename kde5 to kf5, as
it is based on the KDE frameworks 5 libraries.
This also includes:
* a convenience alias to load the kf5 VCL plugin in case someone
requests the kde5 plugin.
* keep convenience kde5 configure switch, but warn about it
* rename detected desktop from kde5 to plasma5
Change-Id: I6764a05b81a5edbf284484c234fee2649aacf735
Reviewed-on: https://gerrit.libreoffice.org/75313
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 730a3408a240..a66077d3bcbb 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3076,9 +3076,9 @@ endef endif # SYSTEM_POSTGRESQL -ifeq ($(ENABLE_KDE5),TRUE) +ifeq ($(ENABLE_KF5),TRUE) -define gb_LinkTarget__use_kde5 +define gb_LinkTarget__use_kf5 $(call gb_LinkTarget_set_include,$(1),\ $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem /,-isystem/,$(KF5_CFLAGS)))) \ $$(INCLUDE) \ @@ -3094,13 +3094,13 @@ $(call gb_LinkTarget_add_libs,$(1),\ endef -else # !ENABLE_KDE5 +else # !ENABLE_KF5 -define gb_LinkTarget__use_kde5 +define gb_LinkTarget__use_kf5 endef -endif # ENABLE_KDE5 +endif # ENABLE_KF5 |