Michael Weghorn
63fc6f1247
QT_HAS_INCLUDE no longer exists in current Qt 6, making
the workaround obsolete, see upstream qtbase commit [1]
(included in Qt >= 6.5):
commit 71f35d6057eb65a217ebb8d2bfad365da27e537e
Author: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Date: Mon Nov 21 15:30:03 2022 +0100
Remove QT_HAS_FOO() wrapper macros for __has_foo()
Using wrappers for these macros is problematic when for example passing
the -frewrite-includes flag to preprocess sources before shipping off to
distcc or Icecream. It will also start producing warnings when compilers
implement http://eel.is/c++draft/cpp.cond#7.sentence-2. See for example
https://reviews.llvm.org/D49091
Now that all uses of the macros are gone, we can follow up
c3bd5ffdc8a3b459f18ba6e35fca93e29f3b0ab0 and remove the wrappers.
Change-Id: I764aea17dcdabd420097a7f4bc0b987a53a345eb
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Drop the workaround, which also fixes this build error
with clang-cl on Windows when experimenting with WIP
change [2] to support the qt6 VCL plugin on Windows:
[build CXX] vcl/qt6/QtAccessibleInterimChildWidget.cxx
clang-cl: warning: unknown argument ignored in clang-cl: '-include' [-Wunknown-argument]
clang-cl: error: cannot specify '-FoC:/Users/mwegh/development/git/libreoffice-WORKTREE/workdir/CxxObject/vcl/qt6/QtAccessibleInterimChildWidget.o' when compiling multiple source files
clang-cl: warning: chrono: 'linker' input unused [-Wunused-command-line-argument]
make[1]: *** [C:/Users/mwegh/development/git/libreoffice-WORKTREE/solenv/gbuild/LinkTarget.mk:338: C:/Users/mwegh/development/git/libreoffice-WORKTREE/workdir/CxxObject/vcl/qt6/QtAccessibleInterimChildWidget.o] Error 1
[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=71f35d6057eb65a217ebb8d2bfad365da27e537e
[2] https://gerrit.libreoffice.org/c/core/+/199615
Change-Id: I8696c25a75f597ee014fcb7374f0106635a34615
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/202282
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
78 lines
1.9 KiB
Makefile
78 lines
1.9 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
# This file incorporates work covered by the following license notice:
|
|
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one or more
|
|
# contributor license agreements. See the NOTICE file distributed
|
|
# with this work for additional information regarding copyright
|
|
# ownership. The ASF licenses this file to you under the Apache
|
|
# License, Version 2.0 (the "License"); you may not use this file
|
|
# except in compliance with the License. You may obtain a copy of
|
|
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
#
|
|
|
|
$(eval $(call gb_Library_Library,vclplug_kf6))
|
|
|
|
$(eval $(call gb_Library_set_plugin_for,vclplug_kf6,vcl))
|
|
|
|
$(eval $(call gb_Library_use_custom_headers,vclplug_kf6,vcl/unx/kf6))
|
|
|
|
$(eval $(call gb_Library_set_include,vclplug_kf6,\
|
|
$$(INCLUDE) \
|
|
-I$(SRCDIR)/vcl/inc \
|
|
-I$(SRCDIR)/vcl/inc/qt6 \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_defs,vclplug_kf6,\
|
|
-DVCLPLUG_KF_IMPLEMENTATION \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_sdk_api,vclplug_kf6))
|
|
|
|
$(eval $(call gb_Library_use_libraries,vclplug_kf6,\
|
|
vclplug_qt6 \
|
|
tl \
|
|
utl \
|
|
sot \
|
|
ucbhelper \
|
|
basegfx \
|
|
comphelper \
|
|
cppuhelper \
|
|
i18nlangtag \
|
|
i18nutil \
|
|
$(if $(ENABLE_JAVA), \
|
|
jvmaccess) \
|
|
cppu \
|
|
sal \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_externals,vclplug_kf6,\
|
|
boost_headers \
|
|
cairo \
|
|
graphite \
|
|
harfbuzz \
|
|
icuuc \
|
|
kf6 \
|
|
epoxy \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_exception_objects,vclplug_kf6,\
|
|
vcl/unx/kf6/KFFilePicker \
|
|
vcl/unx/kf6/KFSalInstance \
|
|
))
|
|
|
|
ifeq ($(OS),LINUX)
|
|
$(eval $(call gb_Library_add_libs,vclplug_kf6,\
|
|
-lm \
|
|
-ldl \
|
|
))
|
|
endif
|
|
|
|
# vim: set noet sw=4 ts=4:
|