Plugins now show up in plugin manager

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6144 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 29, 2006 · ff7d108 · ff7d108
1 parent cdd3115
commit ff7d108
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 1 deletion.
diff --git a/settings.pro b/settings.pro
@@ -203,7 +203,7 @@ INCLUDEPATH +=$${WORKDIR}/src \
               $${WORKDIR}/src/plugins \
               $${WORKDIR}/src/providers \
               $${WORKDIR}/src/raster \
-	      $${WORKDIR}/src/providers/wfs \
+      	      $${WORKDIR}/src/providers/wfs \
               $${WORKDIR}/src/ui 
 INCLUDEPATH += $${OBJDIR}/ui 
 

diff --git a/src/plugins/copyright_label/copyright_label.pro b/src/plugins/copyright_label/copyright_label.pro
@@ -22,6 +22,15 @@ CONFIG(debug, debug|release){
   TARGET = $$member(TARGET, 0)-debug
 }
 
+# This is a hack (thanks freddy!) because many plugins use the
+# same class names and file names we need to force the compiler
+# to create separate object files for them.
+MYDIRNAME=copyright_label
+MOC_DIR = $${OBJDIR}/moc/plugins/$${MYDIRNAME}
+UI_DIR = $${OBJDIR}/ui/plugins/$${MYDIRNAME}
+win32:OBJECTS_DIR = $${OBJDIR}/o/win32/plugins/$${MYDIRNAME}
+INCLUDEPATH += $${OBJDIR}/ui 
+
 LIBS += $${QGISCORELIBADD}
 LIBS += $${QGISGUILIBADD}
 DESTDIR=$${QGISPLUGINDIR}

diff --git a/src/plugins/grid_maker/grid_maker.pro b/src/plugins/grid_maker/grid_maker.pro
@@ -22,6 +22,15 @@ CONFIG(debug, debug|release){
   TARGET = $$member(TARGET, 0)-debug
 }
 
+# This is a hack (thanks freddy!) because many plugins use the
+# same class names and file names we need to force the compiler
+# to create separate object files for them.
+MYDIRNAME=grid_maker
+MOC_DIR = $${OBJDIR}/moc/plugins/$${MYDIRNAME}
+UI_DIR = $${OBJDIR}/ui/plugins/$${MYDIRNAME}
+win32:OBJECTS_DIR = $${OBJDIR}/o/win32/plugins/$${MYDIRNAME}
+INCLUDEPATH += $${OBJDIR}/ui 
+
 LIBS += $${QGISCORELIBADD}
 LIBS += $${QGISGUILIBADD}
 DESTDIR=$${QGISPLUGINDIR}

diff --git a/src/plugins/north_arrow/north_arrow.pro b/src/plugins/north_arrow/north_arrow.pro
@@ -22,6 +22,15 @@ CONFIG(debug, debug|release){
   TARGET = $$member(TARGET, 0)-debug
 }
 
+# This is a hack (thanks freddy!) because many plugins use the
+# same class names and file names we need to force the compiler
+# to create separate object files for them.
+MYDIRNAME=north_arrow
+MOC_DIR = $${OBJDIR}/moc/plugins/$${MYDIRNAME}
+UI_DIR = $${OBJDIR}/ui/plugins/$${MYDIRNAME}
+win32:OBJECTS_DIR = $${OBJDIR}/o/win32/plugins/$${MYDIRNAME}
+INCLUDEPATH += $${OBJDIR}/ui 
+
 LIBS += $${QGISCORELIBADD}
 LIBS += $${QGISGUILIBADD}
 DESTDIR=$${QGISPLUGINDIR}

diff --git a/src/plugins/scale_bar/scale_bar.pro b/src/plugins/scale_bar/scale_bar.pro
@@ -22,6 +22,16 @@ CONFIG(debug, debug|release){
   TARGET = $$member(TARGET, 0)-debug
 }
 
+
+# This is a hack (thanks freddy!) because many plugins use the
+# same class names and file names we need to force the compiler
+# to create separate object files for them.
+MYDIRNAME=scale_bar
+MOC_DIR = $${OBJDIR}/moc/plugins/$${MYDIRNAME}
+UI_DIR = $${OBJDIR}/ui/plugins/$${MYDIRNAME}
+win32:OBJECTS_DIR = $${OBJDIR}/o/win32/plugins/$${MYDIRNAME}
+INCLUDEPATH += $${OBJDIR}/ui 
+
 LIBS += $${QGISCORELIBADD}
 LIBS += $${QGISGUILIBADD}
 DESTDIR=$${QGISPLUGINDIR}