Partially revert "fix and bring back scroll area into custom widgets"

This reverts commit 5dce8ed. The custom widget is still causing isseus - refs #18065
qgis · Feb 23, 2018 · e0fa2c2 · e0fa2c2
1 parent e6331e4
commit e0fa2c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/customwidgets/CMakeLists.txt b/src/customwidgets/CMakeLists.txt
@@ -36,7 +36,7 @@ SET (QGIS_CUSTOMWIDGETS_SRCS
   qgsrelationreferencewidgetplugin.cpp
   qgsscalerangewidgetplugin.cpp
   qgsscalewidgetplugin.cpp
-  qgsscrollareawidgetplugin.cpp
+#  qgsscrollareawidgetplugin.cpp
   qgsspinboxplugin.cpp
   qgssymbolbuttonplugin.cpp
 )
@@ -67,7 +67,7 @@ SET (QGIS_CUSTOMWIDGETS_MOC_HDRS
   qgsrelationreferencewidgetplugin.h
   qgsscalerangewidgetplugin.h
   qgsscalewidgetplugin.h
-  qgsscrollareawidgetplugin.h
+#  qgsscrollareawidgetplugin.h
   qgsspinboxplugin.h
   qgssymbolbuttonplugin.h
 )

diff --git a/src/customwidgets/qgiscustomwidgets.cpp b/src/customwidgets/qgiscustomwidgets.cpp
@@ -40,7 +40,7 @@
 #include "qgsrelationreferencewidgetplugin.h"
 #include "qgsscalerangewidgetplugin.h"
 #include "qgsscalewidgetplugin.h"
-#include "qgsscrollareawidgetplugin.h"
+//#include "qgsscrollareawidgetplugin.h"
 #include "qgsspinboxplugin.h"
 #include "qgssymbolbuttonplugin.h"
 
@@ -71,7 +71,7 @@ QgisCustomWidgets::QgisCustomWidgets( QObject *parent )
   mWidgets.append( new QgsRelationReferenceWidgetPlugin( this ) );
   mWidgets.append( new QgsScaleRangeWidgetPlugin( this ) );
   mWidgets.append( new QgsScaleWidgetPlugin( this ) );
-  mWidgets.append( new QgsScrollAreaWidgetPlugin( this ) );
+//  mWidgets.append( new QgsScrollAreaWidgetPlugin( this ) ); // this is causing troubles at the moment
   mWidgets.append( new QgsSpinBoxPlugin( this ) );
   mWidgets.append( new QgsSymbolButtonPlugin( this ) );
 }