From 2f159df3b74bae8bcc737c508da6db0a76377c9a Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Mon, 31 Jul 2023 07:04:25 -0400
Subject: [PATCH] changes for portability with Qt 5.12 on Ubuntu 20.04LTS

---
 tools/lammps-gui/CMakeLists.txt  | 4 ++--
 tools/lammps-gui/imageviewer.cpp | 4 ++++
 tools/lammps-gui/lammpsgui.cpp   | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/lammps-gui/CMakeLists.txt b/tools/lammps-gui/CMakeLists.txt
index f77d10ae2d..adfe236ee5 100644
--- a/tools/lammps-gui/CMakeLists.txt
+++ b/tools/lammps-gui/CMakeLists.txt
@@ -78,7 +78,7 @@ set(PROJECT_SOURCES
   stdcapture.cpp
   ${PLUGIN_LOADER_SRC}
 )
-qt_add_resources(PROJECT_SOURCES lammpsgui.qrc)
+qt5_add_resources(PROJECT_SOURCES lammpsgui.qrc)
 
 if(APPLE)
   set(MACOSX_ICON_FILE ${LAMMPS_DIR}/cmake/packaging/lammps.icns)
@@ -99,7 +99,7 @@ else()
   target_link_libraries(lammps-gui PRIVATE ${LAMMPS_LIBRARY})
 endif()
 target_compile_definitions(lammps-gui PRIVATE LAMMPS_GUI_VERSION="${PROJECT_VERSION}")
-target_link_libraries(lammps-gui PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
+target_link_libraries(lammps-gui PRIVATE Qt5::Widgets)
 if(BUILD_OMP)
   find_package(OpenMP COMPONENTS CXX REQUIRED)
   target_link_libraries(lammps-gui PRIVATE OpenMP::OpenMP_CXX)
diff --git a/tools/lammps-gui/imageviewer.cpp b/tools/lammps-gui/imageviewer.cpp
index 70bd105a96..6b38e6bbe9 100644
--- a/tools/lammps-gui/imageviewer.cpp
+++ b/tools/lammps-gui/imageviewer.cpp
@@ -161,7 +161,11 @@ void ImageViewer::updateActions()
 void ImageViewer::scaleImage(double factor)
 {
     scaleFactor *= factor;
+#if QT_VERSION < QT_VERSION_CHECK(5,15,0)
+    imageLabel->resize(scaleFactor * imageLabel->pixmap()->size());
+#else
     imageLabel->resize(scaleFactor * imageLabel->pixmap(Qt::ReturnByValue).size());
+#endif
 
     adjustScrollBar(scrollArea->horizontalScrollBar(), factor);
     adjustScrollBar(scrollArea->verticalScrollBar(), factor);
diff --git a/tools/lammps-gui/lammpsgui.cpp b/tools/lammps-gui/lammpsgui.cpp
index 07695b2e0e..c51c5f8904 100644
--- a/tools/lammps-gui/lammpsgui.cpp
+++ b/tools/lammps-gui/lammpsgui.cpp
@@ -611,7 +611,7 @@ void LammpsGui::about()
     QFont font;
     font.setFixedPitch(true);
     font.setStyleHint(QFont::TypeWriter);
-    font.setFamilies(QStringList({"Arial", "Helvetica"}));
+    font.setFamily("Arial");
     font.setPointSize(8);
     msg.setFont(font);
     msg.exec();