Skip to content
Permalink
Browse files
Tweak to go with svn r5815
git-svn-id: http://svn.osgeo.org/qgis/trunk@5821 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
g_j_m committed Sep 13, 2006
1 parent b672fa7 commit 44a2bc351b4f2be769da18a8b3127d057467b0ea
Showing with 7 additions and 5 deletions.
  1. +4 −4 src/gui/Makefile.am
  2. +3 −1 src/gui/qgscontinuouscolordialog.cpp
@@ -48,13 +48,13 @@ lib_LTLIBRARIES = libqgis_gui.la

qgis_SOURCES = main.cpp

qgis_LDADD = ../raster/libqgis_raster.la ../legend/libqgis_legend.la ../composer/libqgis_composer.la $(LDADD) $(QT_LDADD) $(GDAL_LDADD) $(PG_LIB) $(GEOS_LDADD) $(PYTHON_LIB) -lproj -lsqlite3 libqgis_gui.la ../core/libqgis_core.la
qgis_LDADD = $(GDAL_LDADD) $(GEOS_LDADD) ../raster/libqgis_raster.la ../legend/libqgis_legend.la ../composer/libqgis_composer.la $(LDADD) $(QT_LDADD) $(PG_LIB) $(PYTHON_LIB) -lproj -lsqlite3 libqgis_gui.la ../core/libqgis_core.la
if HAVE_QTMAC
qgis_LDFLAGS = -framework ApplicationServices
else
qgis_LDFLAGS = -rdynamic
endif
qgis_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(HAVE_PYTHON) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) -I../ui/ -I../widgets/projectionselector/ -I../legend/ -I../raster/ -I../composer/ -I../core/ -I../plugins/
qgis_CXXFLAGS = $(GEOS_CFLAGS) $(GDAL_CFLAGS) $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(HAVE_PYTHON) $(PYTHON_INCLUDE_DIR) -I../ui/ -I../widgets/projectionselector/ -I../legend/ -I../raster/ -I../composer/ -I../core/ -I../plugins/


##
@@ -295,7 +295,7 @@ nodist_libqgis_gui_la_SOURCES = $(libqgis_gui_la_MOC)
BUILT_SOURCES = $(libqgis_gui_la_MOC) $(qgis_YACC) $(postgresMOC)


libqgis_gui_la_LIBADD = ../core/libqgis_core.la ../raster/libqgis_raster.la ../legend/libqgis_legend.la ../composer/libqgis_composer.la ../widgets/projectionselector/libqgsprojectionselector.la $(QT_LDADD) $(GEOS_LDADD) $(GDAL_LDADD) $(PYTHON_LIB) -lsqlite3
libqgis_gui_la_LIBADD = $(GEOS_LDADD) ../core/libqgis_core.la ../raster/libqgis_raster.la ../legend/libqgis_legend.la ../composer/libqgis_composer.la ../widgets/projectionselector/libqgsprojectionselector.la $(QT_LDADD) $(GDAL_LDADD) $(PYTHON_LIB) -lsqlite3
libqgis_gui_la_LDFLAGS = -version-info $(INTERFACE_VERSION)

libqgis_gui_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) $(HAVE_PYTHON) -I../ui/ -I../widgets/projectionselector/ -I../legend/ -I../raster/ -I../composer/ -I../core/ -I../plugins/
@@ -318,7 +318,7 @@ if HAVE_POSTGRESQL

EXTRA_DIST += $(postgresSOURCES) \
$(postgresLIBSOURCES)

pkginclude_HEADERS += $(postgresHEADERS) \
$(postgresLIBHEADERS) \
$(libqgisHEADERS)
@@ -84,10 +84,12 @@ QgsContinuousColorDialog::QgsContinuousColorDialog(QgsVectorLayer * layer)
lblMinValue->setPaletteBackgroundColor(minsymbol->brush().color());
lblMaxValue->setPaletteBackgroundColor(maxsymbol->brush().color());
}
outlinewidthspinbox->setValue(minsymbol->pen().width());
outlinewidthspinbox->setMinValue(1);
outlinewidthspinbox->setValue(minsymbol->pen().width());
}


cb_polygonOutline->setCheckState(Qt::Checked);
outlinewidthspinbox->setEnabled(true);
}

0 comments on commit 44a2bc3

Please sign in to comment.