Fix addDbLayerAction insertion point when arcgis provider is enabled

qgis · Jun 3, 2016 · 04e1e96859ca6d66ccab5507d20eb37dd3795e7f · 04e1e96 · nirvn · Jun 3, 2016
1 parent 8f15877
commit 04e1e96859ca6d66ccab5507d20eb37dd3795e7f
Unified Split

Showing with 3 additions and 1 deletion.

+3 −1 src/app/qgisapp.cpp
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2175,6 +2175,8 @@ void QgisApp::createToolBars()
   mLayerToolBar->removeAction( mActionAddWfsLayer );
   featureServiceAction->setObjectName( "ActionFeatureService" );
   connect( bt, SIGNAL( triggered( QAction * ) ), this, SLOT( toolButtonActionTriggered( QAction * ) ) );
+#else
+  QAction* mapServiceAction = mActionAddWmsLayer;
 #endif
 
   // add db layer button
@@ -2206,7 +2208,7 @@ void QgisApp::createToolBars()
   }
   if ( defAddDbLayerAction )
     bt->setDefaultAction( defAddDbLayerAction );
-  QAction* addDbLayerAction = mLayerToolBar->insertWidget( mActionAddWmsLayer, bt );
+  QAction* addDbLayerAction = mLayerToolBar->insertWidget( mapServiceAction, bt );
   addDbLayerAction->setObjectName( "ActionAddDbLayer" );
   connect( bt, SIGNAL( triggered( QAction * ) ), this, SLOT( toolButtonActionTriggered( QAction * ) ) );