[QgsQuick] Qt6-related updates (#50809)

qgis · Nov 8, 2022 · 89a23fa · 89a23fa
1 parent f2a3db0
commit 89a23fa
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 9 deletions.
diff --git a/src/quickgui/qgsquickmapcanvasmap.cpp b/src/quickgui/qgsquickmapcanvasmap.cpp
@@ -401,7 +401,6 @@ void QgsQuickMapCanvasMap::geometryChange( const QRectF &newGeometry, const QRec
 {
   QQuickItem::geometryChange( newGeometry, oldGeometry );
 #endif
-  QQuickItem::geometryChanged( newGeometry, oldGeometry );
   if ( newGeometry.size() != oldGeometry.size() )
   {
     mMapSettings->setOutputSize( newGeometry.size().toSize() );

diff --git a/src/quickgui/qgsquickmapsettings.cpp b/src/quickgui/qgsquickmapsettings.cpp
@@ -18,9 +18,7 @@
 #include "qgsquickmapsettings.h"
 
 #include "qgsmaplayer.h"
-#include "qgsmaplayerstylemanager.h"
 #include "qgsmessagelog.h"
-#include "qgsproject.h"
 #include "qgsprojectviewsettings.h"
 
 QgsQuickMapSettings::QgsQuickMapSettings( QObject *parent )

diff --git a/src/quickgui/qgsquickmapsettings.h b/src/quickgui/qgsquickmapsettings.h
@@ -23,11 +23,9 @@
 #include "qgscoordinatetransformcontext.h"
 #include "qgsmaplayer.h"
 #include "qgsmapsettings.h"
-#include "qgsmapthemecollection.h"
 #include "qgspoint.h"
 #include "qgsrectangle.h"
-
-class QgsProject;
+#include "qgsproject.h"
 
 /**
  * \ingroup quick

diff --git a/src/quickgui/qgsquickmaptransform.cpp b/src/quickgui/qgsquickmaptransform.cpp
@@ -14,7 +14,6 @@
  ***************************************************************************/
 
 #include "qgsquickmaptransform.h"
-#include "qgsquickmapsettings.h"
 
 void QgsQuickMapTransform::applyTo( QMatrix4x4 *matrix ) const
 {

diff --git a/src/quickgui/qgsquickmaptransform.h b/src/quickgui/qgsquickmaptransform.h
@@ -20,8 +20,7 @@
 #include <QMatrix4x4>
 
 #include "qgis_quick.h"
-
-class QgsQuickMapSettings;
+#include "qgsquickmapsettings.h"
 
 /**
  * \ingroup quick