diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-10-30 18:45:46 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-11-06 12:05:32 +0100 |
| commit | 2ffb83daa4358aaad0cba7ddb67847282ac6fcce (patch) | |
| tree | 2bf819492eb68134e8678e8138c983c57845e7e8 /RepositoryExternal.mk | |
| parent | KF5 implement some more stuff (diff) | |
| download | core-2ffb83daa4358aaad0cba7ddb67847282ac6fcce.tar.gz core-2ffb83daa4358aaad0cba7ddb67847282ac6fcce.zip | |
QT5 rename from KF5
Move out of unx, as this will eventually compile on other
OS platforms. At least currently it doesn't contain platform
dependant code.
Change-Id: Iea0bebf574201881ea158381fe7ba8af2a9a6488
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2fc8f3fbafb6..0e4c15b6ba5f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3066,20 +3066,20 @@ endef endif # ENABLE_KDE4 -ifeq ($(ENABLE_KF5),TRUE) +ifeq ($(ENABLE_QT5),TRUE) -define gb_LinkTarget__use_kf5 +define gb_LinkTarget__use_qt5 $(call gb_LinkTarget_set_include,$(1),\ - $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem /,-isystem/,$(KF5_CFLAGS)))) \ - $$(INCLUDE) \ + $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem /,-isystem/,$(QT5_CFLAGS)))) \ + $$(INCLUDE) \ ) $(call gb_LinkTarget_add_defs,$(1),\ - $(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(KF5_CFLAGS))) \ + $(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(QT5_CFLAGS))) \ ) $(call gb_LinkTarget_add_libs,$(1),\ - $(KF5_LIBS) \ + $(QT5_LIBS) \ ) ifeq ($(COM),GCC) @@ -3090,13 +3090,13 @@ endif endef -else # !ENABLE_KF5 +else # !ENABLE_QT5 -define gb_LinkTarget__use_kf5 +define gb_LinkTarget__use_qt5 endef -endif # ENABLE_KF5 +endif # ENABLE_QT5 # PYTHON # extra python_headers external because pyuno wrapper must not link python |