From c933d1a2b5b1e6381f1f1911ee267943e16a8ef5 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Mon, 23 May 2022 23:28:12 +0200 Subject: [PATCH 1/3] Fixed an issue with MSVC builds --- src/layview/layview/gsiDeclLayLayoutView_qt.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layview/layview/gsiDeclLayLayoutView_qt.cc b/src/layview/layview/gsiDeclLayLayoutView_qt.cc index aac221373..4a86add4b 100644 --- a/src/layview/layview/gsiDeclLayLayoutView_qt.cc +++ b/src/layview/layview/gsiDeclLayLayoutView_qt.cc @@ -55,7 +55,7 @@ static lay::LayoutView *new_view2 (bool editable, db::Manager *manager, unsigned return new lay::LayoutView (manager, editable, 0 /*plugin parent*/, 0 /*parent*/, "view", options); } -extern Class decl_LayoutViewBase; +extern LAYBASIC_PUBLIC Class decl_LayoutViewBase; Class decl_LayoutView (decl_LayoutViewBase, "lay", "LayoutView", #if defined(HAVE_QTBINDINGS) From d6f320bc8b072b26f79893658258e81f97815a19 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Tue, 24 May 2022 07:48:20 +0200 Subject: [PATCH 2/3] Fixed build for Qt <5.10, MSVC --- src/laybasic/laybasic/layColor.cc | 1 + src/laybasic/laybasic/layPixelBuffer.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/laybasic/laybasic/layColor.cc b/src/laybasic/laybasic/layColor.cc index ac486cdbb..01b7cdd8d 100644 --- a/src/laybasic/laybasic/layColor.cc +++ b/src/laybasic/laybasic/layColor.cc @@ -26,6 +26,7 @@ #include "tlMath.h" #include +#include namespace lay { diff --git a/src/laybasic/laybasic/layPixelBuffer.cc b/src/laybasic/laybasic/layPixelBuffer.cc index f5584d0e2..2b77bb467 100644 --- a/src/laybasic/laybasic/layPixelBuffer.cc +++ b/src/laybasic/laybasic/layPixelBuffer.cc @@ -290,7 +290,7 @@ QImage PixelBuffer::to_image_copy () const { QImage img (m_width, m_height, m_transparent ? QImage::Format_ARGB32 : QImage::Format_RGB32); -#if QT_VERSION < 0x050000 +#if QT_VERSION < 0x051000 memcpy (img.bits (), data (), img.byteCount ()); #else memcpy (img.bits (), data (), img.sizeInBytes ()); From 348faa64b3893433c3693c8d68dad9e484a32938 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Tue, 24 May 2022 12:54:52 +0200 Subject: [PATCH 3/3] Another fix for Qt <5.10 --- src/laybasic/laybasic/layPixelBuffer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/laybasic/laybasic/layPixelBuffer.cc b/src/laybasic/laybasic/layPixelBuffer.cc index 2b77bb467..c5ef44a2b 100644 --- a/src/laybasic/laybasic/layPixelBuffer.cc +++ b/src/laybasic/laybasic/layPixelBuffer.cc @@ -707,7 +707,7 @@ QImage BitmapBuffer::to_image_copy () const { QImage img (m_width, m_height, QImage::Format_MonoLSB); -#if QT_VERSION < 0x050000 +#if QT_VERSION < 0x051000 memcpy (img.bits (), data (), img.byteCount ()); #else memcpy (img.bits (), data (), img.sizeInBytes ());