Skip to content

Commit d743bdd

Browse files
author
timlinux
committedApr 2, 2006
Some updates for qt designer plugin support - still in progress...
git-svn-id: http://svn.osgeo.org/qgis/trunk@5133 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 2b6b2eb commit d743bdd

File tree

7 files changed

+44
-242
lines changed

7 files changed

+44
-242
lines changed
 
707 Bytes
Loading
826 Bytes
Binary file not shown.

‎src/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ endif
1515
# depend on the existence of libqgis_gui.
1616
# gui *must* be specified immediately before the providers
1717
# subdirectory.
18-
SUBDIRS = core ui legend raster composer widgets gui providers plugins $(MAC) helpviewer
18+
SUBDIRS = core ui legend raster composer widgets gui providers plugins $(MAC) helpviewer designer
1919

‎src/designer/Makefile.am

Lines changed: 38 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,49 @@
1010
#
1111
# $Id: Makefile.am 4490 2006-01-07 01:09:27Z timlinux $
1212

13+
##
14+
## ----------------------------------------------------------------------
15+
## Define Targets
16+
## ----------------------------------------------------------------------
17+
##
18+
lib_LTLIBRARIES= libqgis_designerwidgets.la
19+
## TODO change this so it installs into ${QTDIR}/plugins/designer
20+
libqgis_designerwidgetsdir = ${pkglibdir}/designer
1321

14-
plugindir = ${pkglibdir}/designer
22+
##
23+
## ----------------------------------------------------------------------
24+
## get Qt4 to run moc and rcc where required...
25+
## ----------------------------------------------------------------------
26+
##
1527

28+
#run moc on files
1629
%.moc.cpp: %.h
1730
$(MOC) -o $@ $<
1831

19-
# name of the designer plugin
20-
plugin_LTLIBRARIES = qgisdesignerwidgets.la
32+
#qt resources
33+
%.qrc.cpp: %.qrc
34+
$(RCC) -o $@ $<
2135

22-
qgisdesignerwidgets_la_SOURCES = qgsdesignerwidgets.cpp \
23-
qgsdesignerwidgets.h \
24-
$(projectionselector_la_MOC)
36+
libqgis_designerwidgets_la_MOC = qgsprojectionselectorwidget.moc.cpp
2537

26-
qgisdesignerwidgets_la_MOC = qgsprojectionselectorplugin.moc.cpp
38+
libqgis_designerwidgets_RES = qgisdesignerwidgets.qrc.cpp
2739

28-
#projectionselector_la_LIBADD = ../src/gui/libqgis_gui.la $(QT_LDADD)
29-
#qgisdesignerwidgets_la_LIBADD = $(QT_LDADD) ../widgets/projectionselector/libqgsprojectionselector.la
30-
qgisdesignerwidgets_la_LDFLAGS = -avoid-version -module
31-
qgisdesignerwidgets_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../gui/ -I../legend
40+
libqgis_designerwidgets_QRC = qgisdesignerwidgets.qrc
41+
42+
43+
## $(libqgis_designerwidgets_la_MOC) \
44+
libqgis_designerwidgets_la_SOURCES = qgsprojectionselectorwidget.cpp \
45+
$(libqgis_designerwidgets_QRC) \
46+
$(libqgis_designerwidgets_RES)
47+
48+
49+
libqgis_designerwidgets_la_LIBADD = $(QT_LDADD) ../widgets/projectionselector/libqgsprojectionselector.la
50+
libqgis_designerwidgets_la_LDFLAGS = -avoid-version -module
51+
libqgis_designerwidgets_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../gui/ -I../legend -I../core -I../widgets/projectionselector/
52+
53+
##
54+
## ----------------------------------------------------------------------
55+
## additional files that need to be installed go here
56+
## ----------------------------------------------------------------------
57+
##
58+
libqgis_designerwidgets_HEADERS = qgsprojectionselectorwidget.h

‎src/designer/qgisdesignerwidgets.qrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<RCC>
2+
<qresource prefix="/" >
3+
<file>../../images/designer_widget_icons/projectionselector.png</file>
4+
</qresource>
5+
</RCC>

‎src/designer/qgsdesignerwidgets.cpp

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

‎src/designer/qgsdesignerwidgets.h

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

0 commit comments

Comments
 (0)
Please sign in to comment.