summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/qt5/Qt5Menu.hxx2
-rw-r--r--vcl/meson.build155
-rw-r--r--vcl/unx/kf5/KF5FilePicker.hxx5
3 files changed, 112 insertions, 50 deletions
diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index 2e5434f4db74..472fec0f3800 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -12,6 +12,7 @@
#include <salmenu.hxx>
#include <QtCore/QObject>
+#include <QtWidgets/QMenu>
#include <memory>
@@ -19,7 +20,6 @@ class MenuItemList;
class QAction;
class QActionGroup;
class QPushButton;
-class QMenu;
class QMenuBar;
class Qt5MenuItem;
class Qt5Frame;
diff --git a/vcl/meson.build b/vcl/meson.build
index d65df1190c97..625546a77fdd 100644
--- a/vcl/meson.build
+++ b/vcl/meson.build
@@ -6,7 +6,8 @@ glxtest_lib = static_library('glxtest', 'unx/glxtest.cxx',
vcl_lib = shared_library('vcllo',
'source/animate/Animation.cxx',
'source/animate/AnimationBitmap.cxx',
- 'source/window/aboutdialog.cxx',
+ 'source/printer/QueueInfo.cxx',
+ 'source/window/bubblewindow.cxx',
'source/window/errinf.cxx',
'source/window/settings.cxx',
'source/window/paint.cxx',
@@ -45,11 +46,9 @@ vcl_lib = shared_library('vcllo',
'source/window/menuitemlist.cxx',
'source/window/menuwindow.cxx',
'source/window/mnemonic.cxx',
- 'source/window/mnemonicengine.cxx',
'source/window/mouse.cxx',
'source/window/NotebookBarAddonsMerger.cxx',
'source/window/OptionalBox.cxx',
- 'source/window/popupmenuwindow.cxx',
'source/window/printdlg.cxx',
'source/window/scrwnd.cxx',
'source/window/seleng.cxx',
@@ -79,6 +78,7 @@ vcl_lib = shared_library('vcllo',
'source/control/fixed.cxx',
'source/control/fixedhyper.cxx',
'source/control/hyperlabel.cxx',
+ 'source/control/InterimItemWindow.cxx',
'source/control/fmtfield.cxx',
'source/control/imgctrl.cxx',
'source/control/imivctl1.cxx',
@@ -99,6 +99,7 @@ vcl_lib = shared_library('vcllo',
'source/control/spinfld.cxx',
'source/control/tabctrl.cxx',
'source/control/throbber.cxx',
+ 'source/control/WeldedTabbedNotebookbar.cxx',
'source/control/wizardmachine.cxx',
'source/edit/vclmedit.cxx',
'source/edit/textdata.cxx',
@@ -148,17 +149,18 @@ vcl_lib = shared_library('vcllo',
'source/treelist/svimpbox.cxx',
'source/treelist/svlbitm.cxx',
'source/treelist/uiobject.cxx',
- 'source/gdi/alpha.cxx',
- 'source/gdi/bitmap3.cxx',
- 'source/gdi/bitmapex.cxx',
- 'source/gdi/bmpacc2.cxx',
- 'source/gdi/bmpacc3.cxx',
- 'source/gdi/bmpacc.cxx',
- 'source/gdi/bmpfast.cxx',
+ 'source/bitmap/alpha.cxx',
+ 'source/bitmap/BitmapBasicMorphologyFilter.cxx',
+ 'source/bitmap/BitmapEx.cxx',
+ 'source/bitmap/BitmapFilterStackBlur.cxx',
+ 'source/bitmap/BitmapInfoAccess.cxx',
+ 'source/bitmap/BitmapReadAccess.cxx',
+ 'source/bitmap/BitmapWriteAccess.cxx',
+ 'source/bitmap/bmpfast.cxx',
'source/gdi/configsettings.cxx',
'source/gdi/cvtgrf.cxx',
'source/gdi/svmconverter.cxx',
- 'source/gdi/dibtools.cxx',
+ 'source/bitmap/dibtools.cxx',
'source/gdi/embeddedfontshelper.cxx',
'source/gdi/FileDefinitionWidgetDraw.cxx',
'source/gdi/WidgetDefinitionReader.cxx',
@@ -175,7 +177,7 @@ vcl_lib = shared_library('vcllo',
'source/gdi/impanmvw.cxx',
'source/gdi/impglyphitem.cxx',
'source/gdi/impgraph.cxx',
- 'source/gdi/impvect.cxx',
+ 'source/bitmap/impvect.cxx',
'source/gdi/jobset.cxx',
'source/gdi/lineinfo.cxx',
'source/gdi/mapmod.cxx',
@@ -184,6 +186,7 @@ vcl_lib = shared_library('vcllo',
'source/gdi/pdfbuildin_fonts.cxx',
'source/gdi/pdfextoutdevdata.cxx',
'source/gdi/pdffontcache.cxx',
+ 'source/gdi/pdfobjectcopier.cxx',
'source/gdi/pdfwriter.cxx',
'source/gdi/pdfwriter_impl2.cxx',
'source/gdi/pdfwriter_impl.cxx',
@@ -206,18 +209,31 @@ vcl_lib = shared_library('vcllo',
'source/gdi/TypeSerializer.cxx',
'source/pdf/ResourceDict.cxx',
'source/pdf/Matrix3.cxx',
+ 'source/graphic/BinaryDataContainer.cxx',
+ 'source/graphic/BinaryDataContainerTools.cxx',
+ 'source/graphic/GraphicID.cxx',
'source/graphic/GraphicLoader.cxx',
'source/graphic/GraphicObject.cxx',
'source/graphic/GraphicObject2.cxx',
+ 'source/graphic/GraphicReader.cxx',
'source/graphic/grfattr.cxx',
'source/graphic/Manager.cxx',
+ 'source/graphic/UnoBinaryDataContainer.cxx',
'source/graphic/UnoGraphic.cxx',
'source/graphic/UnoGraphicDescriptor.cxx',
'source/graphic/UnoGraphicObject.cxx',
'source/graphic/UnoGraphicProvider.cxx',
'source/graphic/UnoGraphicTransformer.cxx',
+ 'source/graphic/VectorGraphicSearch.cxx',
+ 'source/graphic/VectorGraphicLoader.cxx',
'source/bitmap/bitmap.cxx',
+ 'source/bitmap/impvect.cxx',
'source/bitmap/bitmapfilter.cxx',
+ 'source/bitmap/dibtools.cxx',
+ 'source/bitmap/bmpfast.cxx',
+ 'source/bitmap/bitmapfilter.cxx',
+ 'source/bitmap/bitmappaint.cxx',
+ 'source/bitmap/BitmapShadowFilter.cxx',
'source/bitmap/BitmapAlphaClampFilter.cxx',
'source/bitmap/BitmapMonochromeFilter.cxx',
'source/bitmap/BitmapSmoothenFilter.cxx',
@@ -288,10 +304,17 @@ vcl_lib = shared_library('vcllo',
'source/app/unohelp.cxx',
'source/app/vclevent.cxx',
'source/app/weldutils.cxx',
+ 'source/app/watchdog.cxx',
'source/app/winscheduler.cxx',
'source/components/dtranscomp.cxx',
'source/components/factory.cxx',
'source/components/fontident.cxx',
+ 'source/filter/bmp/BmpReader.cxx',
+ 'source/filter/bmp/BmpWriter.cxx',
+ 'source/filter/egif/egif.cxx',
+ 'source/filter/egif/giflzwc.cxx',
+ 'source/filter/eps/eps.cxx',
+ 'source/filter/etiff/etiff.cxx',
'source/filter/FilterConfigCache.cxx',
'source/filter/FilterConfigItem.cxx',
'source/filter/graphicfilter.cxx',
@@ -299,30 +322,50 @@ vcl_lib = shared_library('vcllo',
'source/filter/GraphicNativeTransform.cxx',
'source/filter/GraphicNativeMetadata.cxx',
'source/filter/GraphicFormatDetector.cxx',
+ 'source/filter/idxf/dxf2mtf.cxx',
+ 'source/filter/idxf/dxfblkrd.cxx',
+ 'source/filter/idxf/dxfentrd.cxx',
+ 'source/filter/idxf/dxfgrprd.cxx',
+ 'source/filter/idxf/dxfreprd.cxx',
+ 'source/filter/idxf/dxftblrd.cxx',
+ 'source/filter/idxf/dxfvec.cxx',
+ 'source/filter/idxf/idxf.cxx',
+ 'source/filter/ieps/ieps.cxx',
'source/filter/igif/decode.cxx',
'source/filter/igif/gifread.cxx',
- 'source/filter/ipdf/pdfread.cxx',
+ 'source/filter/imet/ios2met.cxx',
+ 'source/filter/ipbm/ipbm.cxx',
+ 'source/filter/ipcd/ipcd.cxx',
+ 'source/filter/ipcx/ipcx.cxx',
'source/filter/ipdf/pdfdocument.cxx',
+ 'source/filter/ipdf/pdfread.cxx',
+ 'source/filter/ipict/ipict.cxx',
+ 'source/filter/ipict/shape.cxx',
+ 'source/filter/ipsd/ipsd.cxx',
+ 'source/filter/iras/iras.cxx',
+ 'source/filter/itga/itga.cxx',
+ 'source/filter/itiff/ccidecom.cxx',
+ 'source/filter/itiff/itiff.cxx',
+ 'source/filter/itiff/lzwdecom.cxx',
'source/filter/ixbm/xbmread.cxx',
'source/filter/ixpm/xpmread.cxx',
'source/filter/jpeg/Exif.cxx',
- 'source/filter/jpeg/jpeg.cxx',
'source/filter/jpeg/jpegc.cxx',
+ 'source/filter/jpeg/jpeg.cxx',
'source/filter/jpeg/JpegReader.cxx',
- 'source/filter/jpeg/JpegWriter.cxx',
'source/filter/jpeg/JpegTransform.cxx',
+ 'source/filter/jpeg/JpegWriter.cxx',
'source/filter/jpeg/transupp.c',
+ 'source/filter/png/PngImageReader.cxx',
+ 'source/filter/png/pngwrite.cxx',
'source/filter/wmf/emfwr.cxx',
'source/filter/wmf/wmf.cxx',
'source/filter/wmf/wmfexternal.cxx',
'source/filter/wmf/wmfwr.cxx',
- 'source/filter/png/PngImageReader.cxx',
- 'source/filter/png/pngread.cxx',
- 'source/filter/png/pngwrite.cxx',
'source/font/Feature.cxx',
'source/font/FeatureCollector.cxx',
'source/font/FeatureParser.cxx',
- 'source/font/OpenTypeFeatureDefinitonList.cxx',
+ 'source/font/OpenTypeFeatureDefinitionList.cxx',
'source/font/PhysicalFontCollection.cxx',
'source/font/PhysicalFontFace.cxx',
'source/font/PhysicalFontFamily.cxx',
@@ -339,12 +382,24 @@ vcl_lib = shared_library('vcllo',
'source/fontsubset/sft.cxx',
'source/fontsubset/ttcr.cxx',
'source/fontsubset/xlat.cxx',
+ 'source/pdf/DummyPDFiumLibrary.cxx',
+ 'source/pdf/ExternalPDFStreams.cxx',
+ 'source/pdf/PDFiumTools.cxx',
'source/pdf/XmpMetadata.cxx',
'source/uitest/logger.cxx',
'source/uitest/uiobject.cxx',
'source/uitest/uitest.cxx',
'source/uitest/uno/uiobject_uno.cxx',
'source/uitest/uno/uitest_uno.cxx',
+ 'source/control/calendar.cxx',
+ 'source/control/managedmenubutton.cxx',
+ 'source/control/ContextVBox.cxx',
+ 'source/control/DropdownBox.cxx',
+ 'source/control/NotebookbarPopup.cxx',
+ 'source/control/PriorityHBox.cxx',
+ 'source/control/PriorityMergedHBox.cxx',
+ 'source/cnttype/mcnttfactory.cxx',
+ 'source/cnttype/mcnttype.cxx',
'backendtest/outputdevice/bitmap.cxx',
'backendtest/outputdevice/common.cxx',
'backendtest/outputdevice/gradient.cxx',
@@ -357,27 +412,18 @@ vcl_lib = shared_library('vcllo',
'backendtest/outputdevice/polyline.cxx',
'backendtest/outputdevice/polyline_b2d.cxx',
'backendtest/outputdevice/rectangle.cxx',
+ 'jsdialog/jsdialogbuilder.cxx',
+ 'jsdialog/executor.cxx',
# OpenGL
- 'opengl/DeviceInfo.cxx',
- 'opengl/gdiimpl.cxx',
- 'opengl/salbmp.cxx',
- 'opengl/scale.cxx',
- 'opengl/framebuffer.cxx',
- 'opengl/program.cxx',
- 'opengl/texture.cxx',
- 'opengl/FixedTextureAtlas.cxx',
- 'opengl/PackedTextureAtlas.cxx',
- 'opengl/RenderList.cxx',
- 'opengl/LineRenderUtils.cxx',
+ 'source/opengl/DeviceInfo.cxx',
'source/opengl/OpenGLContext.cxx',
'source/opengl/OpenGLHelper.cxx',
'skia/SkiaHelper.cxx',
- 'opengl/x11/X11DeviceInfo.cxx',
+ 'source/opengl/x11/X11DeviceInfo.cxx',
# X11
'source/app/salplug.cxx',
'unx/generic/printer/jobdata.cxx',
'unx/generic/printer/ppdparser.cxx',
- 'unx/generic/gdi/nativewindowhandleprovider.cxx',
'unx/generic/window/screensaverinhibitor.cxx',
'unx/generic/printer/cpdmgr.cxx',
'null/printerinfomanager.cxx',
@@ -386,6 +432,7 @@ vcl_lib = shared_library('vcllo',
'headless/svptext.cxx',
'unx/generic/app/gendata.cxx',
'unx/generic/gdi/cairotextrender.cxx',
+ 'unx/generic/gdi/freetypetextrender.cxx',
'unx/generic/glyphs/freetype_glyphcache.cxx',
'unx/generic/glyphs/glyphcache.cxx',
'unx/generic/fontmanager/fontsubst.cxx',
@@ -398,6 +445,7 @@ vcl_lib = shared_library('vcllo',
'unx/generic/print/glyphset.cxx',
'unx/generic/print/printerjob.cxx',
'unx/generic/print/psputil.cxx',
+ 'unx/generic/print/GenPspGfxBackend.cxx',
'unx/generic/print/genpspgraphics.cxx',
'unx/generic/print/genprnpsp.cxx',
'unx/generic/print/prtsetup.cxx',
@@ -488,9 +536,7 @@ vclplug_gtk3 = shared_library('vclplug_gtk3lo',
'unx/gtk3/gtk3gtkinst.cxx',
'unx/gtk3/gtk3gtksys.cxx',
'unx/gtk3/cairo_gtk3_cairo.cxx',
- 'unx/gtk3/gtk3gtkprintwrapper.cxx',
'unx/gtk3/gtk3salnativewidgets-gtk.cxx',
- 'unx/gtk3/gtk3salprn-gtk.cxx',
'unx/gtk3/gtk3gtkframe.cxx',
'unx/gtk3/gtk3gtkobject.cxx',
'unx/gtk3/gtk3gtksalmenu.cxx',
@@ -499,9 +545,12 @@ vclplug_gtk3 = shared_library('vclplug_gtk3lo',
'unx/gtk3/gtk3hudawareness.cxx',
udk_fake_h, off_fake_h, common_hxx,
include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', setup_inc],
- cpp_args: ['-DLIBO_INTERNAL_ONLY',
- '-DVCLPLUG_GTK_IMPLEMENTATION',
- '-Wno-deprecated-declarations'],
+ cpp_args: [
+ '-DLIBO_INTERNAL_ONLY',
+ '-DVCL_INTERNALS',
+ '-DVCLPLUG_GTK_IMPLEMENTATION',
+ '-Wno-deprecated-declarations',
+ ],
link_with: [
basegfx_lib,
comphelper_lib,
@@ -561,15 +610,16 @@ vclplug_gen = shared_library('vclplug_genlo',
'unx/generic/gdi/xrender_peer.cxx',
'unx/generic/window/salframe.cxx',
'unx/generic/window/salobj.cxx',
+ 'source/opengl/x11/context.cxx',
'unx/x11/x11sys.cxx',
'unx/x11/xlimits.cxx',
- 'opengl/x11/cairotextrender.cxx',
- 'opengl/x11/gdiimpl.cxx',
- 'opengl/x11/salvd.cxx',
udk_fake_h, off_fake_h,
- cpp_args: ['-DVCLPLUG_GEN_IMPLEMENTATION',
- '-DLIBO_INTERNAL_ONLY',
- '-DUSE_RANDR'],
+ cpp_args: [
+ '-DVCLPLUG_GEN_IMPLEMENTATION',
+ '-DLIBO_INTERNAL_ONLY',
+ '-DVCL_INTERNALS',
+ '-DUSE_RANDR',
+ ],
include_directories: [main_inc, udkh_inc, offapi_inc, 'inc'],
link_with: [
basegfx_lib,
@@ -617,7 +667,10 @@ executable('vcldemo',
'unx/glxtest.cxx',
'source/salmain/salmain.cxx',
udk_fake_h, off_fake_h,
- cpp_args: ['-DLIBO_INTERNAL_ONLY'],
+ cpp_args: [
+ '-DLIBO_INTERNAL_ONLY',
+ '-DVCL_INTERNALS',
+ ],
include_directories: [main_inc, udkh_inc, offapi_inc, 'inc'],
link_with: [basegfx_lib,
comphelper_lib,
@@ -674,6 +727,11 @@ vclplug_qt5_moc = qt5.preprocess(
'inc/qt5/Qt5Widget.hxx',
'inc/qt5/Qt5XAccessible.hxx'
],
+ moc_extra_arguments: [
+ '-DLIBO_INTERNAL_ONLY',
+ '-DVCL_INTERNALS',
+ '-DVCLPLUG_QT5_IMPLEMENTATION',
+ ],
include_directories: 'inc/qt5',
dependencies: [ qt5_dep ],
)
@@ -713,9 +771,12 @@ vclplug_qt5 = shared_library('vclplug_qt5lo',
vclplug_qt5_moc,
udk_fake_h, off_fake_h, common_hxx,
include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'inc/qt5', setup_inc],
- cpp_args: ['-DLIBO_INTERNAL_ONLY',
- '-DVCLPLUG_QT5_IMPLEMENTATION',
- '-Wno-deprecated-declarations'],
+ cpp_args: [
+ '-DLIBO_INTERNAL_ONLY',
+ '-DVCL_INTERNALS',
+ '-DVCLPLUG_QT5_IMPLEMENTATION',
+ '-Wno-deprecated-declarations',
+ ],
link_with: [
basegfx_lib,
comphelper_lib,
diff --git a/vcl/unx/kf5/KF5FilePicker.hxx b/vcl/unx/kf5/KF5FilePicker.hxx
index 4cf84c7fecbd..c3012b883fe9 100644
--- a/vcl/unx/kf5/KF5FilePicker.hxx
+++ b/vcl/unx/kf5/KF5FilePicker.hxx
@@ -20,9 +20,10 @@
#pragma once
#include <Qt5FilePicker.hxx>
-#include <memory>
-class QGridLayout;
+#include <QtWidgets/QGridLayout>
+
+#include <memory>
class KF5FilePicker final : public Qt5FilePicker
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-23 22:16:18 +0000