File tree 22 files changed +31
-23
lines changed
22 files changed +31
-23
lines changed Original file line number Diff line number Diff line change @@ -508,7 +508,6 @@ AC_CONFIG_FILES([
508
508
src/Makefile
509
509
src/composer/Makefile
510
510
src/core/Makefile
511
- src/designer/Makefile
512
511
src/helpviewer/Makefile
513
512
src/gui/Makefile
514
513
src/legend/Makefile
@@ -527,7 +526,6 @@ AC_CONFIG_FILES([
527
526
src/plugins/grass/themes/default/Makefile
528
527
src/plugins/grass/themes/Makefile
529
528
src/plugins/grid_maker/Makefile
530
- src/plugins/maplayer/Makefile
531
529
src/plugins/north_arrow/Makefile
532
530
src/plugins/scale_bar/Makefile
533
531
src/plugins/spit/Makefile
Original file line number Diff line number Diff line change @@ -12,11 +12,8 @@ docdatadir = $(datadir)/$(PACKAGE)/doc
12
12
13
13
docdata_DATA = \
14
14
favicon.ico \
15
- images \
16
15
index.html \
17
- install_guide \
18
16
install.pdf \
19
- plugins \
20
17
qgisdoc.css \
21
18
userguide.pdf
22
19
Original file line number Diff line number Diff line change @@ -14,4 +14,4 @@ docdata_DATA = qgis_new_80pct.png
14
14
15
15
# generated by ls -1 | sed -e '/CVS/d' -e '/Makefile/d' -e 's#\(.*\)# \1 \\#'
16
16
17
- EXTRA_DIST = $(docdata_DATA )
17
+ # EXTRA_DIST = $(docdata_DATA)
Original file line number Diff line number Diff line change 12
12
13
13
imagedir = ${pkgdatadir}/themes/default
14
14
15
- image_DATA = *.png
15
+ image_DATA = *.png *.xpm
16
16
17
17
EXTRA_DIST = $(image_DATA )
Original file line number Diff line number Diff line change 1
1
<h3>Attribute Table</h3>
2
+ The Attribute Table dialog displays the rows and columns from the selected
3
+ layer. From this dialog you can view, edit, and search attributes.
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ const char* QGis::qgisSvnVersion = QGSSVNVERSION;
16
16
const int QGis::qgisVersionInt =800 ;
17
17
18
18
// Release name
19
- const char * QGis::qgisReleaseName = " Titan - Release Candidate 1 " ;
19
+ const char * QGis::qgisReleaseName = " Titan" ;
20
20
21
21
const char * QGis::qgisVectorGeometryType[] =
22
22
{
Original file line number Diff line number Diff line change @@ -65,6 +65,7 @@ qgis_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS
65
65
66
66
libqgis_guiHEADERS = \
67
67
qgisapp.h \
68
+ qgisgui.h \
68
69
qgisiface.h \
69
70
qgisinterface.h \
70
71
qgsabout.h \
@@ -95,6 +96,7 @@ libqgis_guiHEADERS = \
95
96
qgslabel.h \
96
97
qgslayerprojectionselector.h \
97
98
qgslinestyledialog.h \
99
+ qgslinestylewidget.h \
98
100
qgsludialog.h \
99
101
qgsmapcanvas.h \
100
102
qgsmapcanvasitem.h \
@@ -136,6 +138,7 @@ libqgis_guiHEADERS = \
136
138
qgsuniquevaluerenderer.h \
137
139
qgsuniquevaluedialog.h \
138
140
qgsvectorfilewriter.h \
141
+ qgsvectorlayer.h \
139
142
qgsvectorlayerproperties.h \
140
143
qgsvertexmarker.h
141
144
@@ -313,7 +316,7 @@ pkginclude_dir = $(includedir)/qgis
313
316
314
317
CLEANFILES = $(BUILT_SOURCES )
315
318
316
- EXTRA_DIST =
319
+ EXTRA_DIST = $( libqgis_gui_la_MOC )
317
320
318
321
if HAVE_POSTGRESQL
319
322
Original file line number Diff line number Diff line change @@ -46,7 +46,7 @@ qgis_help_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS)
46
46
47
47
CLEANFILES = $(BUILT_SOURCES )
48
48
49
- EXTRA_DIST = $(qgis_help_UIC ) icon.xpm
49
+ EXTRA_DIST = $(qgis_help_UIC )
50
50
51
51
# Qt/Mac app needs to be inside a bundle to function correctly
52
52
MACBINDIR = $(bindir ) /qgis_help.app/Contents/MacOS
Original file line number Diff line number Diff line change @@ -36,6 +36,7 @@ libqgis_legend_la_SOURCES = qgslegendgroup.cpp \
36
36
37
37
libqgis_legendHEADERS = \
38
38
qgslegend.h \
39
+ qgslegendgroup.h \
39
40
qgslegenditem.h \
40
41
qgslegendlayer.h \
41
42
qgslegendlayerfile.h \
@@ -58,6 +59,8 @@ BUILT_SOURCES = $(qgis_MOC)
58
59
59
60
CLEANFILES = $(BUILT_SOURCES )
60
61
62
+ # EXTRA_DIST = $(libqgis_legendHEADERS)
63
+
61
64
pkginclude_dir = $(includedir ) /qgis
62
65
pkginclude_HEADERS = $(libqgis_legendHEADERS )
63
66
Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ SUBDIRS = $(GEOPROCESSING) \
31
31
32
32
EXTRA_DIST = \
33
33
plugin_builder.pl \
34
- plugin_template/icon.xpm \
34
+ plugin_template/plugin.png \
35
35
plugin_template/Makefile.am \
36
36
plugin_template/plugin.cpp \
37
37
plugin_template/pluginguibase.ui \
Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ plugin_UIC = pluginguibase.ui
41
41
42
42
plugin_RES = copyright_plugin.qrc.cpp
43
43
44
- plugin_QRC = copyright_plugin.qrc
44
+ # plugin_QRC = copyright_plugin.qrc
45
45
46
46
# UI dependencies
47
47
pluginguibase.cpp : pluginguibase.h pluginguibase.ui
Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ plugin_UI = ui_qgsdelimitedtextpluginguibase.h
32
32
33
33
plugin_UIC = qgsdelimitedtextpluginguibase.ui
34
34
35
- plugin_QRC = delimited_text.qrc
35
+ # plugin_QRC = delimited_text.qrc
36
36
37
37
plugin_RES = delimited_text.qrc.cpp
38
38
Original file line number Diff line number Diff line change @@ -82,7 +82,7 @@ BUILT_SOURCES = $(plugin_UI) $(plugin_MOC) $(plugin_RES)
82
82
83
83
CLEANFILES = $(BUILT_SOURCES )
84
84
85
- EXTRA_DIST = $(plugin_UIC ) zoom_in.xpm zoom_out.xpm pan.xpm add_point.xpm
85
+ EXTRA_DIST = $(plugin_UIC ) add_point.xpm
86
86
87
87
88
88
endif
Original file line number Diff line number Diff line change @@ -33,6 +33,7 @@ gpsimporterplugin_la_SOURCES = \
33
33
qgsgpsdevice.h \
34
34
qgsgpsdevice.cpp \
35
35
qgsgpsplugingui.cpp \
36
+ qgsgpsplugingui.h
36
37
qgsgpsdevicedialog.cpp \
37
38
$(plugin_UI)\
38
39
$(plugin_MOC) \
@@ -74,7 +75,6 @@ CLEANFILES = $(BUILT_SOURCES)
74
75
EXTRA_DIST = $(plugin_UIC ) icon.xpm \
75
76
ui_qgsgpspluginguibase.h \
76
77
ui_qgsgpsdevicedialogbase.h \
77
- ui_qgsgpsplugingui.h \
78
78
qgsgpsplugin.h \
79
79
qgsgpsdevicedialog.h
80
80
Original file line number Diff line number Diff line change @@ -58,7 +58,6 @@ plugin_UI = ui_qgsgrassselectbase.h \
58
58
ui_qgsgrassregionbase.h
59
59
60
60
plugin_UIC = qgsgrassselectbase.ui \
61
- qgsgrassselectbase.ui.h \
62
61
qgsgrasseditbase.ui \
63
62
qgsgrassmapcalcbase.ui \
64
63
qgsgrassmodulebase.ui \
Original file line number Diff line number Diff line change @@ -61,7 +61,7 @@ plugin_UIC = pluginguibase.ui
61
61
62
62
plugin_RES = gridmaker_plugin.qrc.cpp
63
63
64
- plugin_QRC = gridmaker_plugin.qrc
64
+ # plugin_QRC = gridmaker_plugin.qrc
65
65
66
66
BUILT_SOURCES = $(plugin_MOC ) $(plugin_UI ) $(plugin_RES )
67
67
Original file line number Diff line number Diff line change @@ -44,7 +44,7 @@ plugin_UIC = pluginguibase.ui
44
44
45
45
plugin_RES = northarrow_plugin.qrc.cpp
46
46
47
- plugin_QRC = northarrow_plugin.qrc
47
+ # plugin_QRC = northarrow_plugin.qrc
48
48
49
49
50
50
BUILT_SOURCES = $(plugin_MOC ) $(plugin_UI ) $(plugin_RES )
Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ plugin_UIC = pluginguibase.ui
41
41
42
42
plugin_RES = scalebar_plugin.qrc.cpp
43
43
44
- plugin_QRC = scalebar_plugin.qrc
44
+ # plugin_QRC = scalebar_plugin.qrc
45
45
46
46
# UI dependencies
47
47
pluginguibase.cpp : pluginguibase.h pluginguibase.ui
Original file line number Diff line number Diff line change @@ -34,7 +34,7 @@ spit_MOC = qgsspit.moc.cpp \
34
34
35
35
spit_RES = spit.qrc.cpp
36
36
37
- spit_QRC = spit.qrc
37
+ # spit_QRC = spit.qrc
38
38
39
39
spitplugin_la_MOC = $(spit_MOC ) qgsspitplugin.moc.cpp
40
40
Original file line number Diff line number Diff line change @@ -44,15 +44,18 @@ ui_%.h: %.ui
44
44
45
45
wfsplugin_la_SOURCES = qgswfsplugin.cpp \
46
46
qgswfssourceselect.cpp \
47
+ qgswfsplugin.h \
48
+ qgswfssourceselect.h \
47
49
$(plugin_UI ) \
48
50
$(plugin_MOC )
49
51
52
+
50
53
plugin_MOC = qgswfsplugin.moc.cpp \
51
54
qgswfssourceselect.moc.cpp
52
55
53
56
plugin_UI = ui_qgswfssourceselectbase.h
54
57
55
- plugin_UIC = qgswfssourceselectbase.u
58
+ plugin_UIC = qgswfssourceselectbase.ui
56
59
57
60
BUILT_SOURCES = $(plugin_MOC ) $(plugin_UI )
58
61
@@ -79,3 +82,5 @@ wfsplugin_la_CXXFLAGS = $(CXXFLAGS) \
79
82
-I..
80
83
81
84
wfsplugin_la_LDFLAGS = -avoid-version -module
85
+
86
+ EXTRA_DIST = $(wfsplugin_la_HEADERS ) $(PLUGIN_UI ) $(PLUGIN_UIC ) mIconAddWfsLayer.xpm
Original file line number Diff line number Diff line change @@ -6,12 +6,12 @@ INCLUDES = -I../../core/ -I../../gui/ -I../../ui
6
6
plugindir = ${pkglibdir}
7
7
plugin_LTLIBRARIES = libwfsprovider.la
8
8
9
- libwfsprovider_la_SOURCES = qgswfsprovider.cpp $(libwfsprovider_MOC )
9
+ libwfsprovider_la_SOURCES = qgswfsprovider.cpp $(libwfsprovider_MOC ) qgswfsprovider.h
10
10
11
11
BUILT_SOURCES = $(wfsprovider_MOC )
12
12
13
13
libwfsprovider_la_LIBADD = $(QT_LDADD ) $(GDAL_LIB ) $(GEOS_LDADD ) ../../gui/libqgis_gui.la ../../core/libqgis_core.la
14
14
libwfsprovider_la_LDFLAGS = -avoid-version -module
15
15
libwfsprovider_la_CXXFLAGS = $(GDAL_CFLAGS ) $(EXTRA_CXXFLAGS ) $(QT_CXXFLAGS ) $(DEBUG_QGIS ) $(GEOS_CFLAGS ) $(GEOS_CFLAGS ) /geos
16
16
17
- CLEANFILES = $(BUILT_SOURCES )
17
+ CLEANFILES = $(BUILT_SOURCES )
Original file line number Diff line number Diff line change @@ -157,3 +157,4 @@ qgis_ui_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFL
157
157
158
158
CLEANFILES = $(BUILT_SOURCES )
159
159
160
+ EXTRA_DIST = $(qgis_ui_UIHEADERS ) $(postgresUIHEADERS )
You can’t perform that action at this time.
0 commit comments