Skip to content
Permalink
Browse files

try to move the member

  • Loading branch information
3nids committed May 18, 2020
1 parent 5d892e7 commit 1915fe2c08e22d337326b464e33045fbb760d4b8
Showing with 0 additions and 3 deletions.
  1. +0 −3 src/core/qgsapplication.cpp
@@ -2330,7 +2330,6 @@ QgsApplication::ApplicationMembers::ApplicationMembers()
mProfiler->end();
}
mPageSizeRegistry = new QgsPageSizeRegistry();
<<<<<<< HEAD
{
mProfiler->start( tr( "Setup layout item registry" ) );
mLayoutItemRegistry = new QgsLayoutItemRegistry();
@@ -2378,7 +2377,6 @@ QgsApplication::ApplicationMembers::ApplicationMembers()
mProfiler->end();
}
mBasemapPathRegistry = new QgsBasemapPathRegistry();
=======
mLayoutItemRegistry = new QgsLayoutItemRegistry();
mLayoutItemRegistry->populate();
mAnnotationRegistry = new QgsAnnotationRegistry();
@@ -2389,7 +2387,6 @@ QgsApplication::ApplicationMembers::ApplicationMembers()
mClassificationMethodRegistry = new QgsClassificationMethodRegistry();
mBookmarkManager = new QgsBookmarkManager( nullptr );
mScaleBarRendererRegistry = new QgsScaleBarRendererRegistry();
>>>>>>> address review
}

QgsApplication::ApplicationMembers::~ApplicationMembers()

0 comments on commit 1915fe2

Please sign in to comment.
You can’t perform that action at this time.