Skip to content

Commit a0b01f4

Browse files
author
timlinux
committedJan 6, 2006
Moved widgets under src
You will probably need to do a distclean, autogen etc after this change... git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4488 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1Preview-0.9.0-1
1 parent 501e0c7 commit a0b01f4

16 files changed

+20
-23
lines changed
 

‎Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ docdatadir = $(datadir)/$(PACKAGE)/doc
3131
docdata_DATA = AUTHORS
3232

3333
if HAVE_QT3
34-
SUBDIRS = src widgets providers plugins doc tools i18n designer_plugins helpviewer
34+
SUBDIRS = src providers plugins doc tools i18n designer_plugins helpviewer
3535
endif
3636

3737
if HAVE_QT4
38-
SUBDIRS = src widgets providers plugins doc tools i18n helpviewer
38+
SUBDIRS = src providers plugins doc tools i18n helpviewer
3939
endif
4040

4141
pkginclude_HEADERS = qgsconfig.h

‎configure.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,8 @@ AC_CONFIG_FILES([
457457
src/mac/Makefile
458458
src/mac/Contents/Makefile
459459
src/mac/Contents/Resources/Makefile
460+
src/widgets/Makefile
461+
src/widgets/projectionselector/Makefile
460462
providers/Makefile
461463
providers/ogr/Makefile
462464
providers/postgres/Makefile
@@ -490,8 +492,6 @@ AC_CONFIG_FILES([
490492
tools/Makefile
491493
tools/qgis_config/Makefile
492494
tools/mapserver_export/Makefile
493-
widgets/Makefile
494-
widgets/projectionselector/Makefile
495495
designer_plugins/Makefile
496496
i18n/Makefile
497497
helpviewer/Makefile

‎designer_plugins/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ qgisdesignerwidgets_la_SOURCES = qgsprojectionselectorplugin.cpp\
3131
BUILT_SOURCES = $(plugin_MOC)
3232

3333
#projectionselector_la_LIBADD = ../src/libqgis.la $(QT_LDADD)
34-
qgisdesignerwidgets_la_LIBADD = $(QT_LDADD) ../widgets/projectionselector/libqgsprojectionselector.la
34+
qgisdesignerwidgets_la_LIBADD = $(QT_LDADD) ../src/widgets/projectionselector/libqgsprojectionselector.la
3535
qgisdesignerwidgets_la_LDFLAGS = -avoid-version -module
3636
qgisdesignerwidgets_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../src/
3737

‎plugins/grass/qgsgrassnewmapset.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
#include "../../src/qgsrect.h"
5353
#include "../../src/qgscoordinatetransform.h"
5454
#include "../../src/qgsspatialrefsys.h"
55-
#include "../../widgets/projectionselector/qgsprojectionselector.h"
55+
#include "../../src/widgets/projectionselector/qgsprojectionselector.h"
5656

5757
#include "../../providers/grass/qgsgrass.h"
5858
#include "qgsgrassnewmapset.h"

‎plugins/grass/qgsgrassnewmapset.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class QCloseEvent;
3030
#include "../../src/qgisiface.h"
3131
#include "../../src/qgspoint.h"
3232
#include "../../src/qgsspatialrefsys.h"
33-
#include "../../widgets/projectionselector/qgsprojectionselector.h"
33+
#include "../../src/widgets/projectionselector/qgsprojectionselector.h"
3434

3535
class QgsGrassProvider;
3636
#include "qgsgrassplugin.h"

‎src/Makefile.am

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ if HAVE_QTMAC
1717
MAC = mac
1818
endif
1919

20-
SUBDIRS = ui legend svg images themes resources raster composer $(MAC)
20+
SUBDIRS = ui legend svg images themes resources raster composer widgets $(MAC)
2121

2222
if !HAVE_QTMAC
2323
PREFIX=-DPREFIX=\"$(prefix)\"
2424
PLUGINPATH=-DPLUGINPATH=\"$(pkglibdir)\"
2525
PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\"
2626
endif
27-
WIDGETPATH=../widgets
27+
2828
%.moc.cpp: %.h
2929
$(MOC) -o $@ $<
3030

@@ -53,13 +53,13 @@ lib_LTLIBRARIES = libqgis.la
5353

5454
qgis_SOURCES = main.cpp
5555

56-
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
56+
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
5757
if HAVE_QTMAC
5858
qgis_LDFLAGS = -framework ApplicationServices
5959
else
6060
qgis_LDFLAGS = -rdynamic
6161
endif
62-
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/
62+
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/
6363

6464
##
6565
## ----------------------------------------------------------------------
@@ -176,8 +176,7 @@ libqgisHEADERS = \
176176
qgsuvaldialog.h \
177177
qgsvectordataprovider.h \
178178
qgsvectorfilewriter.h \
179-
qgsvectorlayerproperties.h \
180-
$(WIDGETPATH)/projectionselector/qgsprojectionselector.h
179+
qgsvectorlayerproperties.h
181180

182181
## files generated from MOC
183182
libqgis_la_MOC = \
@@ -230,8 +229,7 @@ libqgis_la_MOC = \
230229
qgssisydialog.moc.cpp \
231230
qgsuvaldialog.moc.cpp \
232231
qgsvectorlayer.moc.cpp \
233-
qgsvectorlayerproperties.moc.cpp \
234-
$(WIDGETPATH)/projectionselector/qgsprojectionselector.moc.cpp
232+
qgsvectorlayerproperties.moc.cpp
235233

236234
libqgis_la_SOURCES = \
237235
qgisapp.cpp \
@@ -341,8 +339,7 @@ libqgis_la_SOURCES = \
341339
qgsvectordataprovider.cpp \
342340
qgsvectorfilewriter.cpp \
343341
qgsvectorlayer.cpp \
344-
qgsvectorlayerproperties.cpp \
345-
$(WIDGETPATH)/projectionselector/qgsprojectionselector.cpp
342+
qgsvectorlayerproperties.cpp
346343

347344
if HAVE_POSTGRESQL
348345
postgresHEADERS = qgsdbsourceselect.h \
@@ -372,10 +369,10 @@ nodist_libqgis_la_SOURCES = $(libqgis_la_MOC)
372369
BUILT_SOURCES = $(libqgis_la_MOC) $(qgis_YACC) $(postgresMOC)
373370

374371

375-
libqgis_la_LIBADD = raster/libqgis_raster.la legend/libqgis_legend.la composer/libqgis_composer.la $(QT_LDADD) $(GEOS_LDADD) $(GDAL_LDADD) $(PYTHON_LIB) -lsqlite3
372+
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
376373
libqgis_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
377374

378-
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/
375+
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/
379376

380377
## for installing headers in $(includedir)/qgis
381378
pkginclude_HEADERS = $(qgisHEADERS)

‎src/ui/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ qgis_ui_UIC = \
8080
qgsmarkerdialogbase.ui \
8181
qgsnewhttpconnectionbase.ui \
8282
qgsnewconnectionbase.ui \
83-
$(WIDGETPATH)/projectionselector/qgsprojectionselectorbase.ui
83+
../widgets/projectionselector/qgsprojectionselectorbase.ui
8484

8585
## all the ui files generate a corresponding header file
8686
qgis_ui_UIHEADERS = ui_qgisappbase.h \
@@ -147,7 +147,7 @@ qgis_ui_UIHEADERS = ui_qgisappbase.h \
147147
ui_qgsuvaldialogbase.h \
148148
ui_qgsnewhttpconnectionbase.h \
149149
ui_qgsnewconnectionbase.h \
150-
$(WIDGETPATH)/projectionselector/ui_qgsprojectionselectorbase.h
150+
../widgets/projectionselector/ui_qgsprojectionselectorbase.h
151151

152152

153153
postgresUIHEADERS = ui_qgsdbsourceselectbase.h \

‎widgets/.cvsignore renamed to ‎src/widgets/.cvsignore

File renamed without changes.

‎widgets/Makefile.am renamed to ‎src/widgets/Makefile.am

File renamed without changes.

‎widgets/projectionselector/Makefile.am renamed to ‎src/widgets/projectionselector/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ BUILT_SOURCES = $(selector_MOC) $(selector_UI)
4141
CLEANFILES = $(BUILT_SOURCES)
4242

4343

44-
libqgsprojectionselector_la_LIBADD = ../../src/libqgis.la $(LDADD) $(QT_LDADD) $(GDAL_LDADD) -lsqlite3
44+
libqgsprojectionselector_la_LIBADD = ../../libqgis.la $(LDADD) $(QT_LDADD) $(GDAL_LDADD) -lsqlite3
4545
libqgsprojectionselector_la_LDFLAGS = -avoid-version
46-
libqgsprojectionselector_la_CXXFLAGS = $(PKGDATAPATH) $(CXXFLAGS) $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../../src/
46+
libqgsprojectionselector_la_CXXFLAGS = $(PKGDATAPATH) $(CXXFLAGS) $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../../
4747

4848
EXTRA_DIST = $(selector_UIC)

‎widgets/widgets.pro renamed to ‎src/widgets/widgets.pro

File renamed without changes.

0 commit comments

Comments
 (0)
Please sign in to comment.