diff --git a/python/custom_widgets/qgis_customwidgets.py b/python/custom_widgets/qgis_customwidgets.py index 3207fb71d0c..eeed7bb663e 100644 --- a/python/custom_widgets/qgis_customwidgets.py +++ b/python/custom_widgets/qgis_customwidgets.py @@ -50,6 +50,8 @@ pluginType = MODULE def moduleInformation(): try: import qgis.gui - return "qgis.gui", dir(qgis.gui) + widget_list=dir(qgis.gui) + widget_list.remove('QgsScrollArea') + return "qgis.gui", widget_list except ImportError: return "", [] diff --git a/src/customwidgets/CMakeLists.txt b/src/customwidgets/CMakeLists.txt index 253a5615bc5..6838ace9352 100644 --- 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 ) @@ -66,7 +66,7 @@ SET (QGIS_CUSTOMWIDGETS_MOC_HDRS qgsrelationreferencewidgetplugin.h qgsscalerangewidgetplugin.h qgsscalewidgetplugin.h - qgsscrollareawidgetplugin.h +# qgsscrollareawidgetplugin.h qgsspinboxplugin.h ) diff --git a/src/customwidgets/qgiscustomwidgets.cpp b/src/customwidgets/qgiscustomwidgets.cpp index c3387701f68..c9d26ab9346 100644 --- a/src/customwidgets/qgiscustomwidgets.cpp +++ b/src/customwidgets/qgiscustomwidgets.cpp @@ -39,7 +39,7 @@ #include "qgsrelationreferencewidgetplugin.h" #include "qgsscalerangewidgetplugin.h" #include "qgsscalewidgetplugin.h" -#include "qgsscrollareawidgetplugin.h" +//#include "qgsscrollareawidgetplugin.h" #include "qgsspinboxplugin.h" @@ -69,7 +69,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 ) ); }