Unrolled back the commits that I made earlier that gary rolled back b…

…ecause of a build problem and fixed the underlying cause of the problem. Projection widget no longer requires libqgis thereby eliminating the circular deps. git-svn-id: http://svn.osgeo.org/qgis/trunk@4490 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 7, 2006 · 4f3cf2f · 4f3cf2f
1 parent 571f9d5
commit 4f3cf2f
Show file tree

Hide file tree

Showing 18 changed files with 27 additions and 1,127 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -31,11 +31,11 @@ docdatadir = $(datadir)/$(PACKAGE)/doc
 docdata_DATA = AUTHORS
 
 if HAVE_QT3
-SUBDIRS = src widgets providers plugins doc tools i18n designer_plugins helpviewer
+SUBDIRS = src providers plugins doc tools i18n designer_plugins helpviewer
 endif
 
 if HAVE_QT4
-SUBDIRS = src widgets providers plugins doc tools i18n helpviewer
+SUBDIRS = src providers plugins doc tools i18n helpviewer
 endif
 
 pkginclude_HEADERS = qgsconfig.h

diff --git a/configure.in b/configure.in
@@ -457,6 +457,8 @@ AC_CONFIG_FILES([
   src/mac/Makefile
   src/mac/Contents/Makefile
   src/mac/Contents/Resources/Makefile
+  src/widgets/Makefile
+  src/widgets/projectionselector/Makefile
   providers/Makefile 
   providers/ogr/Makefile
   providers/postgres/Makefile
@@ -490,8 +492,6 @@ AC_CONFIG_FILES([
   tools/Makefile
   tools/qgis_config/Makefile
   tools/mapserver_export/Makefile
-  widgets/Makefile
-  widgets/projectionselector/Makefile
   designer_plugins/Makefile
   i18n/Makefile
   helpviewer/Makefile

diff --git a/designer_plugins/Makefile.am b/designer_plugins/Makefile.am
@@ -31,7 +31,7 @@ qgisdesignerwidgets_la_SOURCES =  qgsprojectionselectorplugin.cpp\
 BUILT_SOURCES = $(plugin_MOC)
 
 #projectionselector_la_LIBADD =  ../src/libqgis.la $(QT_LDADD)
-qgisdesignerwidgets_la_LIBADD =  $(QT_LDADD) ../widgets/projectionselector/libqgsprojectionselector.la
+qgisdesignerwidgets_la_LIBADD =  $(QT_LDADD) ../src/widgets/projectionselector/libqgsprojectionselector.la
 qgisdesignerwidgets_la_LDFLAGS = -avoid-version -module
 qgisdesignerwidgets_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../src/
 

diff --git a/plugins/delimited_text/qgsdelimitedtextplugin.cpp b/plugins/delimited_text/qgsdelimitedtextplugin.cpp
@@ -116,7 +116,11 @@ void QgsDelimitedTextPlugin::initGui()
       "X and Y fields are required and must contain coordinates in decimal units.");
 
   // Create the action for tool
+#if QT_VERSION < 0x040000
+  myQActionPointer = new QAction("Add Delimited Text Layer", QIcon(icon), "&Wmi",0, this, "run");
+#else
   myQActionPointer = new QAction(QIcon(icon), "Add Delimited Text Layer", this);
+#endif
 
   myQActionPointer->setWhatsThis("Add a delimited text file as a map layer. "
       "The file must have a header row containing the field names. "

diff --git a/plugins/grass/qgsgrassnewmapset.cpp b/plugins/grass/qgsgrassnewmapset.cpp
@@ -52,7 +52,7 @@
 #include "../../src/qgsrect.h"
 #include "../../src/qgscoordinatetransform.h"
 #include "../../src/qgsspatialrefsys.h"
-#include "../../widgets/projectionselector/qgsprojectionselector.h"
+#include "../../src/widgets/projectionselector/qgsprojectionselector.h"
 
 #include "../../providers/grass/qgsgrass.h"
 #include "qgsgrassnewmapset.h"

diff --git a/plugins/grass/qgsgrassnewmapset.h b/plugins/grass/qgsgrassnewmapset.h
@@ -30,7 +30,7 @@ class QCloseEvent;
 #include "../../src/qgisiface.h"
 #include "../../src/qgspoint.h"
 #include "../../src/qgsspatialrefsys.h"
-#include "../../widgets/projectionselector/qgsprojectionselector.h"
+#include "../../src/widgets/projectionselector/qgsprojectionselector.h"
 
 class QgsGrassProvider;
 #include "qgsgrassplugin.h"

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -17,14 +17,14 @@ if HAVE_QTMAC
 MAC = mac
 endif
 
-SUBDIRS = ui legend svg images themes resources raster composer $(MAC)
+SUBDIRS = ui legend svg images themes resources raster composer widgets $(MAC)
 
 if !HAVE_QTMAC
 PREFIX=-DPREFIX=\"$(prefix)\"
 PLUGINPATH=-DPLUGINPATH=\"$(pkglibdir)\"
 PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\"
 endif
-WIDGETPATH=../widgets
+
 %.moc.cpp: %.h
 	$(MOC) -o $@ $<
 
@@ -53,13 +53,13 @@ lib_LTLIBRARIES = libqgis.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.la 
+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.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/
+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/
 
 ##
 ## ----------------------------------------------------------------------
@@ -176,8 +176,7 @@ libqgisHEADERS =							\
 		qgsuvaldialog.h					\
 		qgsvectordataprovider.h				\
 		qgsvectorfilewriter.h				\
-		qgsvectorlayerproperties.h			\
-		$(WIDGETPATH)/projectionselector/qgsprojectionselector.h 
+		qgsvectorlayerproperties.h			
 
 ## files generated from MOC
 libqgis_la_MOC =							\
@@ -230,8 +229,7 @@ libqgis_la_MOC =							\
 		qgssisydialog.moc.cpp			\
 		qgsuvaldialog.moc.cpp			\
 		qgsvectorlayer.moc.cpp \
-		qgsvectorlayerproperties.moc.cpp	\
-		$(WIDGETPATH)/projectionselector/qgsprojectionselector.moc.cpp
+		qgsvectorlayerproperties.moc.cpp	
 
 libqgis_la_SOURCES =						\
 		qgisapp.cpp							\
@@ -341,8 +339,7 @@ libqgis_la_SOURCES =						\
 		qgsvectordataprovider.cpp			\
 		qgsvectorfilewriter.cpp				\
 		qgsvectorlayer.cpp \
-		qgsvectorlayerproperties.cpp	\
-		$(WIDGETPATH)/projectionselector/qgsprojectionselector.cpp
+		qgsvectorlayerproperties.cpp	
 
 if HAVE_POSTGRESQL
 postgresHEADERS = qgsdbsourceselect.h		\
@@ -372,10 +369,10 @@ nodist_libqgis_la_SOURCES = $(libqgis_la_MOC)
 BUILT_SOURCES = $(libqgis_la_MOC) $(qgis_YACC)  $(postgresMOC)
 
 
-libqgis_la_LIBADD = raster/libqgis_raster.la legend/libqgis_legend.la composer/libqgis_composer.la $(QT_LDADD) $(GEOS_LDADD) $(GDAL_LDADD) $(PYTHON_LIB) -lsqlite3
+libqgis_la_LIBADD = 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_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
 
-libqgis_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/
+libqgis_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/
 
 ## for installing headers in $(includedir)/qgis
 pkginclude_HEADERS = $(qgisHEADERS) 

diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
@@ -80,7 +80,7 @@ qgis_ui_UIC =	\
 		qgsmarkerdialogbase.ui \
 		qgsnewhttpconnectionbase.ui \
 		qgsnewconnectionbase.ui \
-		$(WIDGETPATH)/projectionselector/qgsprojectionselectorbase.ui
+		../widgets/projectionselector/qgsprojectionselectorbase.ui
 
 ## all the ui files generate a corresponding header file
 qgis_ui_UIHEADERS = ui_qgisappbase.h \
@@ -147,7 +147,7 @@ qgis_ui_UIHEADERS = ui_qgisappbase.h \
 		ui_qgsuvaldialogbase.h \
 		ui_qgsnewhttpconnectionbase.h \
 		ui_qgsnewconnectionbase.h \
-		$(WIDGETPATH)/projectionselector/ui_qgsprojectionselectorbase.h
+		../widgets/projectionselector/ui_qgsprojectionselectorbase.h
 
 
 postgresUIHEADERS = ui_qgsdbsourceselectbase.h	\

diff --git a/src/widgets/projectionselector/Makefile.am b/src/widgets/projectionselector/Makefile.am
@@ -12,6 +12,8 @@
 
 selectordir = ${pkglibdir}
 if !HAVE_QTMAC
+PREFIX=-DPREFIX=\"$(prefix)\"
+PLUGINPATH=-DPLUGINPATH=\"$(pkglibdir)\"
 PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\"
 endif
 
@@ -32,6 +34,7 @@ selector_UI = ui_qgsprojectionselectorbase.h
 
 
 libqgsprojectionselector_la_SOURCES =  qgsprojectionselector.cpp \
+					../../qgsapplication.cpp \
 			         $(selector_UI) \
 			         $(selector_UIC) \
 			         $(selector_MOC) 
@@ -41,8 +44,8 @@ BUILT_SOURCES = $(selector_MOC) $(selector_UI)
 CLEANFILES = $(BUILT_SOURCES)
 
 
-libqgsprojectionselector_la_LIBADD =  ../../libqgis.la $(LDADD) $(QT_LDADD) $(GDAL_LDADD) -lsqlite3
+libqgsprojectionselector_la_LIBADD =  $(LDADD) $(QT_LDADD) $(GDAL_LDADD) -lsqlite3
 libqgsprojectionselector_la_LDFLAGS = -avoid-version 
-libqgsprojectionselector_la_CXXFLAGS = $(PKGDATAPATH) $(CXXFLAGS) $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../../
+libqgsprojectionselector_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(CXXFLAGS) $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../../
 
 EXTRA_DIST = $(selector_UIC)
diff --git a/widgets/.cvsignore b/widgets/.cvsignore
diff --git a/widgets/Makefile.am b/widgets/Makefile.am
diff --git a/widgets/projectionselector/.cvsignore b/widgets/projectionselector/.cvsignore
diff --git a/widgets/projectionselector/Makefile.am b/widgets/projectionselector/Makefile.am
diff --git a/widgets/projectionselector/projectionselector.pro b/widgets/projectionselector/projectionselector.pro