1ace888823
- Implements CreateMessageDialog method for QtInstance which would create message dialogs using native qt widgets. Example - MasterPasswordCreateDialog ( https://git.libreoffice.org/core/+/5e8c0575e877795aaca91346548cd0136fa22048/uui/source/masterpasscrtdlg.cxx#64 ). To trigger this : a) Go to "Tools" -> "Options". b) Select "LibreOfficeDev" -> "Security", then check "Persistently save passwords for web connections". c) In the master password dialog, enter two different passwords and click "OK". The message dialog appears now uses native qt widgets. - adds Env variable SAL_VCL_QT_NO_WELDED_WIDGETS which reverts to previous behavior using VCL widgets. Note: most of the methods from weld::Widget hierarchy are currently just dummy implementations for Qt case, only what's needed for simple message dialogs has been implemented in this patch. Change-Id: I522489b8befb92f0092eb248ea2b81ecfbadd737 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161073 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Jenkins
134 lines
3.4 KiB
Makefile
134 lines
3.4 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_qt6))
|
|
|
|
$(eval $(call gb_Library_set_plugin_for,vclplug_qt6,vcl))
|
|
|
|
$(eval $(call gb_Library_use_custom_headers,vclplug_qt6,vcl/qt6))
|
|
|
|
$(eval $(call gb_Library_set_include,vclplug_qt6,\
|
|
$$(INCLUDE) \
|
|
-I$(SRCDIR)/vcl/inc \
|
|
-I$(SRCDIR)/vcl/inc/qt6 \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_defs,vclplug_qt6,\
|
|
-DVCLPLUG_QT_IMPLEMENTATION \
|
|
-DVCL_INTERNALS \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_sdk_api,vclplug_qt6))
|
|
|
|
$(eval $(call gb_Library_use_libraries,vclplug_qt6,\
|
|
tl \
|
|
utl \
|
|
sot \
|
|
ucbhelper \
|
|
basegfx \
|
|
comphelper \
|
|
cppuhelper \
|
|
i18nlangtag \
|
|
i18nutil \
|
|
$(if $(ENABLE_JAVA), \
|
|
jvmaccess) \
|
|
cppu \
|
|
sal \
|
|
salhelper \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_externals,vclplug_qt6,\
|
|
boost_headers \
|
|
cairo \
|
|
epoxy \
|
|
graphite \
|
|
harfbuzz \
|
|
icu_headers \
|
|
icuuc \
|
|
qt6 \
|
|
))
|
|
|
|
ifneq ($(QT6_HAVE_GOBJECT),)
|
|
$(eval $(call gb_Library_add_cxxflags,vclplug_qt6,\
|
|
$(QT6_GOBJECT_CFLAGS) \
|
|
))
|
|
$(eval $(call gb_Library_add_libs,vclplug_qt6,\
|
|
$(QT6_GOBJECT_LIBS) \
|
|
))
|
|
endif
|
|
|
|
$(eval $(call gb_Library_add_exception_objects,vclplug_qt6,\
|
|
vcl/qt6/QtAccessibleEventListener \
|
|
vcl/qt6/QtAccessibleRegistry \
|
|
vcl/qt6/QtAccessibleWidget \
|
|
vcl/qt6/QtBitmap \
|
|
vcl/qt6/QtClipboard \
|
|
vcl/qt6/QtData \
|
|
vcl/qt6/QtDragAndDrop \
|
|
vcl/qt6/QtFilePicker \
|
|
vcl/qt6/QtFont \
|
|
vcl/qt6/QtFontFace \
|
|
vcl/qt6/QtFrame \
|
|
vcl/qt6/QtGraphics \
|
|
vcl/qt6/QtGraphics_Controls \
|
|
vcl/qt6/QtGraphics_GDI \
|
|
vcl/qt6/QtGraphics_Text \
|
|
vcl/qt6/QtInstance \
|
|
vcl/qt6/QtInstance_Print \
|
|
vcl/qt6/QtInstanceContainer \
|
|
vcl/qt6/QtInstanceDialog \
|
|
vcl/qt6/QtInstanceMessageDialog \
|
|
vcl/qt6/QtInstanceWidget \
|
|
vcl/qt6/QtInstanceWindow \
|
|
vcl/qt6/QtMainWindow \
|
|
vcl/qt6/QtMenu \
|
|
vcl/qt6/QtObject \
|
|
vcl/qt6/QtOpenGLContext \
|
|
vcl/qt6/QtPainter \
|
|
vcl/qt6/QtPrinter \
|
|
vcl/qt6/QtSvpGraphics \
|
|
vcl/qt6/QtSvpSurface \
|
|
vcl/qt6/QtSystem \
|
|
vcl/qt6/QtTimer \
|
|
vcl/qt6/QtTools \
|
|
vcl/qt6/QtTransferable \
|
|
vcl/qt6/QtVirtualDevice \
|
|
vcl/qt6/QtWidget \
|
|
vcl/qt6/QtXAccessible \
|
|
$(if $(USING_X11), \
|
|
vcl/qt6/QtX11Support \
|
|
) \
|
|
))
|
|
|
|
ifeq ($(OS),LINUX)
|
|
$(eval $(call gb_Library_add_libs,vclplug_qt6,\
|
|
-lm \
|
|
-ldl \
|
|
))
|
|
endif
|
|
|
|
# Workaround for clang+icecream (clang's -frewrite-includes
|
|
# doesn't handle Qt6's QT_HAS_INCLUDE that Qt6 uses for <chrono>).
|
|
ifeq ($(COM_IS_CLANG),TRUE)
|
|
$(eval $(call gb_Library_add_cxxflags,vclplug_qt6, \
|
|
-include chrono \
|
|
))
|
|
endif
|
|
|
|
# vim: set noet sw=4 ts=4:
|