mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-25 00:58:06 -05:00
Add -lQtDesigner and relevant includes to that designer plugins can be built
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5132 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
timlinux
parent
321177658f
commit
090344de2a
12
acinclude.m4
12
acinclude.m4
@ -192,6 +192,7 @@ case "${QT_VER}" in
|
||||
QT4_XMLINC=$QTDIR/lib/QtXml.framework/Headers
|
||||
QT4_SVGINC=$QTDIR/lib/QtSvg.framework/Headers
|
||||
QT4_TESINC=$QTDIR/lib/QtTest.framework/Headers
|
||||
QT4_DESIGNERINC=$QTDIR/lib/QtDesigner.framework/Headers
|
||||
;;
|
||||
*)
|
||||
QT4_3SUPPORTINC=$QTINC/Qt3Support
|
||||
@ -203,6 +204,7 @@ case "${QT_VER}" in
|
||||
QT4_XMLINC=$QTINC/QtXml
|
||||
QT4_SVGINC=$QTINC/QtSvg
|
||||
QT4_TESTINC=$QTINC/QtTest
|
||||
QT4_DESIGNERINC=$QTINC/QtDesigner
|
||||
;;
|
||||
esac
|
||||
QT4_DESIGNERINC=$QTINC/QtDesigner
|
||||
@ -273,7 +275,7 @@ if test $QT_MAJOR = "3" ; then
|
||||
QT_CXXFLAGS="-I$QTINC"
|
||||
fi
|
||||
if test $QT_MAJOR = "4" ; then
|
||||
QT_CXXFLAGS="-DQT3_SUPPORT -I$QT4_DEFAULTINC -I$QT4_3SUPPORTINC -I$QT4_COREINC -I$QT4_DESIGNERINC -I$QT4_GUIINC -I$QT4_NETWORKINC -I$QT4_OPENGLINC -I$QT4_SQLINC -I$QT4_XMLINC -I$QTINC -I$QT4_SVGINC -I$QT4_TESTINC"
|
||||
QT_CXXFLAGS="-DQT3_SUPPORT -I$QT4_DEFAULTINC -I$QT4_3SUPPORTINC -I$QT4_COREINC -I$QT4_DESIGNERINC -I$QT4_GUIINC -I$QT4_NETWORKINC -I$QT4_OPENGLINC -I$QT4_SQLINC -I$QT4_XMLINC -I$QTINC -I$QT4_SVGINC -I$QT4_TESTINC -I$QT4_DESIGNERINC"
|
||||
fi
|
||||
QT_IS_EMBEDDED="no"
|
||||
# On unix, figure out if we're doing a static or dynamic link
|
||||
@ -335,7 +337,7 @@ case "${host}" in
|
||||
QT_IS_EMBEDDED="yes"
|
||||
elif test "x`ls $QTDIR/lib/QtCore.framework/QtCore 2> /dev/null`" != x ; then
|
||||
QT_LIB="-Xlinker -F$QTDIR/lib -framework QtCore -framework Qt3Support -framework QtGui -framework QtNetwork -framework QtXml -framework QtSvg"
|
||||
QT_CXXFLAGS="-DQT3_SUPPORT -F$QTDIR/lib -I$QT4_DEFAULTINC -I$QT4_3SUPPORTINC -I$QT4_COREINC -I$QT4_DESIGNERINC -I$QT4_GUIINC -I$QT4_NETWORKINC -I$QT4_OPENGLINC -I$QT4_SQLINC -I$QT4_XMLINC -I$QT4_SVGINC -I$QT4_TESTINC"
|
||||
QT_CXXFLAGS="-DQT3_SUPPORT -F$QTDIR/lib -I$QT4_DEFAULTINC -I$QT4_3SUPPORTINC -I$QT4_COREINC -I$QT4_DESIGNERINC -I$QT4_GUIINC -I$QT4_NETWORKINC -I$QT4_OPENGLINC -I$QT4_SQLINC -I$QT4_XMLINC -I$QT4_SVGINC -I$QT4_TESTINC -I$QT4_DESIGNERINC"
|
||||
QT_IS_MT="yes"
|
||||
fi
|
||||
;;
|
||||
@ -374,7 +376,7 @@ case "${host}" in
|
||||
elif test "x`ls $QTDIR/${_lib}/libQtCore.* /usr/lib/libQtCore.* 2> /dev/null`" != x ; then
|
||||
AC_MSG_RESULT([libQtCore found])
|
||||
QT_LIB="-lQtCore -lQt3Support -lQtGui -lQtNetwork -lQtSvg"
|
||||
QT_CXXFLAGS="-DQT3_SUPPORT -I$QT4_DEFAULTINC -I$QT4_3SUPPORTINC -I$QT4_COREINC -I$QT4_DESIGNERINC -I$QT4_GUIINC -I$QT4_NETWORKINC -I$QT4_OPENGLINC -I$QT4_SQLINC -I$QT4_XMLINC -I$QTINC -I$QT4_SVGINC -I$QT4_TESTINC"
|
||||
QT_CXXFLAGS="-DQT3_SUPPORT -I$QT4_DEFAULTINC -I$QT4_3SUPPORTINC -I$QT4_COREINC -I$QT4_DESIGNERINC -I$QT4_GUIINC -I$QT4_NETWORKINC -I$QT4_OPENGLINC -I$QT4_SQLINC -I$QT4_XMLINC -I$QTINC -I$QT4_SVGINC -I$QT4_TESTINC -I$QT4_DESIGNERINC"
|
||||
QT_IS_MT="yes"
|
||||
fi
|
||||
;;
|
||||
@ -391,7 +393,7 @@ QT_GUILINK=""
|
||||
QASSISTANTCLIENT_LDADD="-lqassistantclient"
|
||||
case "${host}" in
|
||||
*-mingw*)
|
||||
QT_LIBS="-lQtCore4 -lQt3Support4 -lQtGui4 -lQtNetwork4 -lQtXml4 -lQtSvg4 -lQtTest"
|
||||
QT_LIBS="-lQtCore4 -lQt3Support4 -lQtGui4 -lQtNetwork4 -lQtXml4 -lQtSvg4 -lQtTest -lQtDesigner"
|
||||
;;
|
||||
*irix*)
|
||||
QT_LIBS="$QT_LIB"
|
||||
@ -401,7 +403,7 @@ case "${host}" in
|
||||
;;
|
||||
|
||||
*linux*)
|
||||
QT_LIBS="$QT_LIB -lQtCore -lQt3Support -lQtGui -lQtNetwork -lQtXml -lQtSvg -lQtTest"
|
||||
QT_LIBS="$QT_LIB -lQtCore -lQt3Support -lQtGui -lQtNetwork -lQtXml -lQtSvg -lQtTest -lQtDesigner"
|
||||
if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then
|
||||
QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg"
|
||||
fi
|
||||
|
||||
2
build.sh
2
build.sh
@ -24,7 +24,7 @@ then
|
||||
export CXXFLAGS="-g -Wall"
|
||||
fi
|
||||
|
||||
export QTDIR=/usr/local/Trolltech/Qt-4.1.0/
|
||||
export QTDIR=/usr/local/Trolltech/Qt-4.1.0
|
||||
export PATH=$QTDIR/bin:$PATH
|
||||
export LD_LIBRARY_PATH=$QTDIR/lib
|
||||
./autogen.sh $AUTOGEN_FLAGS --prefix=${1} --with-qtdir=$QTDIR --with-grass=/usr/lib/grass && make && make install
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<ignoreparts/>
|
||||
<projectdirectory>.</projectdirectory>
|
||||
<absoluteprojectpath>false</absoluteprojectpath>
|
||||
<description/>
|
||||
<description></description>
|
||||
</general>
|
||||
<kdevautoproject>
|
||||
<general>
|
||||
@ -69,11 +69,11 @@
|
||||
<kdevdebugger>
|
||||
<general>
|
||||
<dbgshell>libtool</dbgshell>
|
||||
<programargs/>
|
||||
<gdbpath/>
|
||||
<configGdbScript/>
|
||||
<runShellScript/>
|
||||
<runGdbScript/>
|
||||
<programargs></programargs>
|
||||
<gdbpath></gdbpath>
|
||||
<configGdbScript></configGdbScript>
|
||||
<runShellScript></runShellScript>
|
||||
<runGdbScript></runGdbScript>
|
||||
<breakonloadinglibs>true</breakonloadinglibs>
|
||||
<separatetty>false</separatetty>
|
||||
<floatingtoolbar>false</floatingtoolbar>
|
||||
@ -158,14 +158,22 @@
|
||||
<headerCompletionDelay>250</headerCompletionDelay>
|
||||
</codecompletion>
|
||||
<creategettersetter>
|
||||
<prefixGet/>
|
||||
<prefixGet></prefixGet>
|
||||
<prefixSet>set</prefixSet>
|
||||
<prefixVariable>m_,_</prefixVariable>
|
||||
<parameterName>theValue</parameterName>
|
||||
<inlineGet>true</inlineGet>
|
||||
<inlineSet>true</inlineSet>
|
||||
</creategettersetter>
|
||||
<references/>
|
||||
<references>
|
||||
<pcs>QGIS</pcs>
|
||||
<pcs>Qt</pcs>
|
||||
</references>
|
||||
<qt>
|
||||
<used>false</used>
|
||||
<version>3</version>
|
||||
<root></root>
|
||||
</qt>
|
||||
</kdevcppsupport>
|
||||
<kdevfileview>
|
||||
<groups>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user