Check for Qt5 when using removed class QDesktopWidget

OPM · Jan 7, 2024 · d38ebf6 · d38ebf6
1 parent 870bcf0
commit d38ebf6
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafFontTools.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafFontTools.cpp
@@ -40,7 +40,10 @@
 #include "cafPdmUiItem.h"
 
 #include <QApplication>
+
+#if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
 #include <QDesktopWidget>
+#endif
 
 #include <cmath>
 
@@ -92,13 +95,15 @@ int FontTools::absolutePointSize( FontSize normalPointSize, RelativeSize relativ
 //--------------------------------------------------------------------------------------------------
 int FontTools::pointSizeToPixelSize( int pointSize )
 {
+#if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
     auto app = dynamic_cast<const QApplication*>( QCoreApplication::instance() );
     if ( app )
     {
         int    dpi    = app->desktop()->logicalDpiX();
         double inches = pointSize / 72.0;
         return static_cast<int>( std::ceil( inches * dpi ) );
     }
+#endif
     return pointSize;
 }
 
@@ -115,13 +120,15 @@ int FontTools::pointSizeToPixelSize( FontSize pointSize )
 //--------------------------------------------------------------------------------------------------
 int FontTools::pixelSizeToPointSize( int pixelSize )
 {
+#if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
     auto app = dynamic_cast<const QApplication*>( QCoreApplication::instance() );
     if ( app )
     {
         int    dpi    = app->desktop()->logicalDpiX();
         double inches = pixelSize / dpi;
         return static_cast<int>( std::ceil( inches * 72.0 ) );
     }
+#endif
     return pixelSize;
 }