Skip to content

Commit 93d817e

Browse files
author
telwertowski
committedJan 5, 2006
Remove copy of qgsmessageviewer from plugins/spit/ and use the one in src/ to avoid Mac duplicate symbol link errors.
(Note: "make clean" should be done to plugins/spit/ before acquiring this revision to avoid "make" problems. See qgis-developer list for more details if problems occur.) git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4478 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1Preview-0.9.0-1
1 parent 638ab43 commit 93d817e

File tree

4 files changed

+1
-140
lines changed

4 files changed

+1
-140
lines changed
 

‎plugins/spit/Makefile.am

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,17 @@ ui_%.h: %.ui
2323
$(UIC) -o $@ $<
2424

2525
spit_MOC = qgsspit.moc.cpp \
26-
qgsconnectiondialog.moc.cpp \
2726
qgsshapefile.moc.cpp \
28-
qgsmessageviewer.moc.cpp \
2927
qgseditreservedwordsdialog.moc.cpp
3028

3129

3230
spitplugin_la_MOC = $(spit_MOC) qgsspitplugin.moc.cpp
3331

3432
spit_UI = ui_qgsconnectiondialogbase.h \
3533
ui_qgsspitbase.h \
36-
ui_qgsmessageviewerbase.h \
3734
ui_qgseditreservedwordsbase.h
3835

3936
spit_UIC = qgsconnectiondialogbase.ui \
40-
qgsmessageviewerbase.ui \
4137
qgsspitbase.ui \
4238
qgseditreservedwordsbase.ui
4339

@@ -48,8 +44,6 @@ common_sources = qgsspit.cpp \
4844
qgsconnectiondialog.h \
4945
qgsshapefile.cpp \
5046
qgsshapefile.h \
51-
qgsmessageviewer.cpp \
52-
qgsmessageviewer.h \
5347
qgseditreservedwordsdialog.h \
5448
qgseditreservedwordsdialog.cpp \
5549
$(spit_UI)
@@ -58,7 +52,7 @@ spitplugin_la_SOURCES = $(common_sources) \
5852
qgsspitplugin.cpp \
5953
qgsspitplugin.h
6054

61-
spit_SOURCES = $(common_sources) ../../src/qgspgutil.cpp main.cpp $(SPIT_UIC) $(spit_MOC)
55+
spit_SOURCES = ../../src/qgsmessageviewer.cpp ../../src/qgspgutil.cpp $(common_sources) main.cpp $(SPIT_UIC) $(spit_MOC)
6256

6357
nodist_spitplugin_la_SOURCES = $(spitplugin_la_MOC)
6458

@@ -67,8 +61,6 @@ nodist_spitplugin_la_SOURCES = $(spitplugin_la_MOC)
6761
##qgsconnectiondialogbase.h: qgsconnectiondialogbase.ui
6862
##qgsspitbase.cpp: qgsspitbase.h qgsspitbase.ui
6963
##qgsspitbase.h: qgsspitbase.ui
70-
##qgsmessageviewerbase.cpp: qgsmessageviewerbase.h qgsmessageviewerbase.ui
71-
##qgsmessageviewerbase.h: qgsmessageviewerbase.ui
7264

7365
BUILT_SOURCES = $(spit_MOC) $(spit_UI) $(spitplugin_la_MOC)
7466

‎plugins/spit/qgsmessageviewer.cpp

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎plugins/spit/qgsmessageviewer.h

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎plugins/spit/qgsmessageviewerbase.ui

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.