sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 5dce8edb95fc2432dedcac3d860bd5d46b16a436.

The custom widget is still causing isseus - refs #18065
This commit is contained in:
Nyall Dawson 2018-02-22 10:00:26 +10:00
parent e6331e42e9
commit e0fa2c2700
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/customwidgets/CMakeLists.txt
View File

@ -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
)

4
src/customwidgets/qgiscustomwidgets.cpp
View File

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