fix build bugs

nextgis · Oct 3, 2023 · d1c7e9c · d1c7e9c
1 parent 53882b1
commit d1c7e9c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 22 deletions.
diff --git a/opt/patches/app_qgisapp.cpp.patch b/opt/patches/app_qgisapp.cpp.patch
@@ -1,5 +1,5 @@
 --- a/src/app/qgisapp.cpp	2023-08-22 11:32:52.639350417 +0300
-+++ b/src/app/qgisapp.cpp	2023-10-03 09:58:11.698535746 +0300
++++ b/src/app/qgisapp.cpp	2023-10-03 15:55:29.005632825 +0300
 @@ -114,7 +114,7 @@
  #include "qgsgeometrycheckregistry.h"
 
@@ -125,21 +125,20 @@
      connect( mDataSourceManagerDialog, &QgsDataSourceManagerDialog::addPointCloudLayer, this, &QgisApp::addPointCloudLayer );
      connect( mDataSourceManagerDialog, &QgsDataSourceManagerDialog::showStatusMessage, this, &QgisApp::showStatusMessage );
      connect( mDataSourceManagerDialog, &QgsDataSourceManagerDialog::addDatabaseLayers, this, &QgisApp::addDatabaseLayers );
-@@ -2695,8 +2699,11 @@
+@@ -2695,8 +2699,10 @@
    connect( mActionNewReport, &QAction::triggered, this, &QgisApp::newReport );
    connect( mActionShowLayoutManager, &QAction::triggered, this, &QgisApp::showLayoutManager );
    connect( mActionExit, &QAction::triggered, this, &QgisApp::fileExit );
 -  connect( mActionDxfExport, &QAction::triggered, this, &QgisApp::dxfExport );
 -  connect( mActionDwgImport, &QAction::triggered, this, &QgisApp::dwgImport );
 +//   connect( mActionDxfExport, &QAction::triggered, this, &QgisApp::dxfExport );
-+//   connect( mActionDwgImport, &QAction::triggered, this, &QgisApp::dwgImport );
 +//  connect( mActionDwgImport, &QAction::triggered, this, [ = ] {
 +//    openFile(QFileDialog::getOpenFileName(this, tr("Open"), QString(), tr("AutoCAD DWG/DXF(*.dxf *.dwg)")));
-+  });
++//  });
 
    // Edit Menu Items
 
-@@ -2843,7 +2850,7 @@
+@@ -2843,7 +2849,7 @@
    connect( mActionAddHanaLayer, &QAction::triggered, this, [ = ] { dataSourceManager( QStringLiteral( "hana" ) ); } );
    connect( mActionAddWmsLayer, &QAction::triggered, this, [ = ] { dataSourceManager( QStringLiteral( "wms" ) ); } );
    connect( mActionAddXyzLayer, &QAction::triggered, this, [ = ] { dataSourceManager( QStringLiteral( "xyz" ) ); } );
@@ -148,7 +147,7 @@
    connect( mActionAddPointCloudLayer, &QAction::triggered, this, [ = ] { dataSourceManager( QStringLiteral( "pointcloud" ) ); } );
    connect( mActionAddWcsLayer, &QAction::triggered, this, [ = ] { dataSourceManager( QStringLiteral( "wcs" ) ); } );
  #ifdef HAVE_SPATIALITE
-@@ -4302,7 +4309,7 @@
+@@ -4302,7 +4308,7 @@
    mActionCustomProjection->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionCustomProjection.svg" ) ) );
    mActionAddWmsLayer->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddWmsLayer.svg" ) ) );
    mActionAddXyzLayer->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddXyzLayer.svg" ) ) );
@@ -157,7 +156,7 @@
    mActionAddWcsLayer->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddWcsLayer.svg" ) ) );
  #ifdef HAVE_SPATIALITE
    mActionAddWfsLayer->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddWfsLayer.svg" ) ) );
-@@ -5047,12 +5054,12 @@
+@@ -5047,12 +5053,12 @@
    }
    return QgsLayerTreeRegistryBridge::InsertionPoint( insertGroup, index );
  }
@@ -172,7 +171,7 @@
  void QgisApp::autoSelectAddedLayer( QList<QgsMapLayer *> layers )
  {
    if ( !layers.isEmpty() )
-@@ -5360,7 +5367,7 @@
+@@ -5360,7 +5366,7 @@
    QgsPluginRegistry::instance()->unloadAll();
  }
 
@@ -181,7 +180,7 @@
 
  void QgisApp::restoreWindowState()
  {
-@@ -5952,7 +5959,7 @@
+@@ -5952,7 +5958,7 @@
        meshLayer->loadDefaultMetadata( ok );
        break;
      }
@@ -190,7 +189,7 @@
      case QgsMapLayerType::VectorTileLayer:
      {
        bool ok = false;
-@@ -5965,7 +5972,7 @@
+@@ -5965,7 +5971,7 @@
 
        break;
      }
@@ -199,7 +198,7 @@
      case QgsMapLayerType::AnnotationLayer:
      case QgsMapLayerType::GroupLayer:
        break;
-@@ -6007,17 +6014,17 @@
+@@ -6007,17 +6013,17 @@
      }
    }
  }
@@ -220,7 +219,7 @@
  QgsVectorTileLayer *QgisApp::addVectorTileLayerPrivate( const QString &url, const QString &baseName, const bool guiWarning )
  {
    QgsCanvasRefreshBlocker refreshBlocker;
-@@ -6055,7 +6062,7 @@
+@@ -6055,7 +6061,7 @@
 
    return layer.release();
  }
@@ -229,7 +228,7 @@
  QgsPointCloudLayer *QgisApp::addPointCloudLayerPrivate( const QString &uri, const QString &baseName, const QString &providerKey, bool guiWarning )
  {
    QgsCanvasRefreshBlocker refreshBlocker;
-@@ -7381,7 +7388,7 @@
+@@ -7381,7 +7387,7 @@
    }
    mProjectLastModified = fullPath.lastModified();
  } // QgisApp::fileSaveAs
@@ -238,7 +237,7 @@
  void QgisApp::dxfExport()
  {
    QgsDxfExportDialog d;
-@@ -7447,7 +7454,7 @@
+@@ -7447,7 +7453,7 @@
    QgsDwgImportDialog d;
    d.exec();
  }
@@ -247,7 +246,7 @@
  void QgisApp::openLayerDefinition( const QString &path )
  {
    QString errorMessage;
-@@ -7651,36 +7658,36 @@
+@@ -7651,36 +7657,36 @@
      }
    }
 
@@ -314,7 +313,7 @@
 
    QList< QgsProviderSublayerModel::NonLayerItem > nonLayerItems;
    if ( QgsProjectStorage *ps = QgsApplication::projectStorageRegistry()->projectStorageFromUri( fileName ) )
-@@ -13012,7 +13019,7 @@
+@@ -13012,7 +13018,7 @@
  {
    QgsScopedRuntimeProfile profile( tr( "Loading Python support" ) );
 
@@ -323,7 +322,7 @@
  #if defined(Q_OS_UNIX)
    pythonlibName.prepend( QgsApplication::libraryPath() );
  #endif
-@@ -13321,7 +13328,7 @@
+@@ -13321,7 +13327,7 @@
      mMagnifierWidget->setDefaultFactor( factor );
      mMagnifierWidget->updateMagnification( factor );
 
@@ -332,7 +331,7 @@
    }
  }
 
-@@ -16163,7 +16170,7 @@
+@@ -16163,7 +16169,7 @@
      }
 
      break;
@@ -341,7 +340,7 @@
      case QgsMapLayerType::VectorTileLayer:
        mActionLocalHistogramStretch->setEnabled( false );
        mActionFullHistogramStretch->setEnabled( false );
-@@ -16233,7 +16240,7 @@
+@@ -16233,7 +16239,7 @@
        enableDigitizeTechniqueActions( false );
        enableMeshEditingTools( false );
        break;
@@ -350,7 +349,7 @@
      case QgsMapLayerType::PointCloudLayer:
        mActionLocalHistogramStretch->setEnabled( false );
        mActionFullHistogramStretch->setEnabled( false );
-@@ -17169,7 +17176,7 @@
+@@ -17169,7 +17175,7 @@
        delete vectorLayerPropertiesDialog; // delete since dialog cannot be reused without updating code
        break;
      }
@@ -359,7 +358,7 @@
      case QgsMapLayerType::VectorTileLayer:
      {
        QgsVectorTileLayerProperties vectorTileLayerPropertiesDialog( qobject_cast<QgsVectorTileLayer *>( mapLayer ), mMapCanvas, visibleMessageBar(), this );
-@@ -17187,7 +17194,7 @@
+@@ -17187,7 +17193,7 @@
        mMapStyleWidget->blockUpdates( false ); // delete since dialog cannot be reused without updating code
        break;
      }

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2702,7 +2702,7 @@ void QgisApp::createActions()
 //   connect( mActionDxfExport, &QAction::triggered, this, &QgisApp::dxfExport );
 //  connect( mActionDwgImport, &QAction::triggered, this, [ = ] {
 //    openFile(QFileDialog::getOpenFileName(this, tr("Open"), QString(), tr("AutoCAD DWG/DXF(*.dxf *.dwg)")));
-  });
+//  });
 
   // Edit Menu Items