Skip to content

Commit

Permalink
Merge pull request #6409 from nyalldawson/fix_18065
Browse files Browse the repository at this point in the history
Revert "fix and bring back scroll area into custom widgets"
  • Loading branch information
nyalldawson committed Feb 23, 2018
2 parents e6331e4 + e0fa2c2 commit af8ca3e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/customwidgets/CMakeLists.txt
Expand Up @@ -36,7 +36,7 @@ SET (QGIS_CUSTOMWIDGETS_SRCS
qgsrelationreferencewidgetplugin.cpp
qgsscalerangewidgetplugin.cpp
qgsscalewidgetplugin.cpp
qgsscrollareawidgetplugin.cpp
# qgsscrollareawidgetplugin.cpp
qgsspinboxplugin.cpp
qgssymbolbuttonplugin.cpp
)
Expand Down Expand Up @@ -67,7 +67,7 @@ SET (QGIS_CUSTOMWIDGETS_MOC_HDRS
qgsrelationreferencewidgetplugin.h
qgsscalerangewidgetplugin.h
qgsscalewidgetplugin.h
qgsscrollareawidgetplugin.h
# qgsscrollareawidgetplugin.h
qgsspinboxplugin.h
qgssymbolbuttonplugin.h
)
Expand Down
4 changes: 2 additions & 2 deletions src/customwidgets/qgiscustomwidgets.cpp
Expand Up @@ -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"

Expand Down Expand Up @@ -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 ) );
}
Expand Down

0 comments on commit af8ca3e

Please sign in to comment.