AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge L_FLAGS and l_FLAGS in configure

Browse Source 
This is prompted by the fact that QMAKE_LIBDIR_FLAGS is no longer
honoured by qmake, so we need to use LIBS. It didn't make much sense
to have the flags separate anyway...

Change-Id: Iaec4d58f9dbac25755bbc3bad7550e03edb5332b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Thiago Macieira 2012-08-11 21:55:20 +02:00 committed by Qt by Nokia
parent ca4823505b
commit f331299f35
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -797,7 +797,6 @@ D_FLAGS=
I_FLAGS= I_FLAGS=
L_FLAGS= L_FLAGS=
RPATH_FLAGS= RPATH_FLAGS=
l_FLAGS=
W_FLAGS= W_FLAGS=
QCONFIG_FLAGS= QCONFIG_FLAGS=
XPLATFORM= # This seems to be the QMAKESPEC, like "linux-g++" XPLATFORM= # This seems to be the QMAKESPEC, like "linux-g++"
@ -1949,7 +1948,7 @@ while [ "$#" -gt 0 ]; do
RPATH_FLAGS="$RPATH_FLAGS \"${VAL}\"" RPATH_FLAGS="$RPATH_FLAGS \"${VAL}\""
;; ;;
add_link) add_link)
l_FLAGS="$l_FLAGS -l\"${VAL}\"" L_FLAGS="$L_FLAGS -l\"${VAL}\""
;; ;;
add_fpath) add_fpath)
if [ "$BUILD_ON_MAC" = "yes" ]; then if [ "$BUILD_ON_MAC" = "yes" ]; then
@ -1961,7 +1960,7 @@ while [ "$#" -gt 0 ]; do
;; ;;
add_framework) add_framework)
if [ "$BUILD_ON_MAC" = "yes" ]; then if [ "$BUILD_ON_MAC" = "yes" ]; then
l_FLAGS="$l_FLAGS -framework \"${VAL}\"" L_FLAGS="$L_FLAGS -framework \"${VAL}\""
else else
UNKNOWN_OPT=yes UNKNOWN_OPT=yes
fi fi
@ -3741,7 +3740,7 @@ compileTest()
path=config.tests/$1 path=config.tests/$1
name=$2 name=$2
shift 2 shift 2
"$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "$path" "$name" $I_FLAGS $D_FLAGS $L_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE "$@" "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "$path" "$name" $I_FLAGS $D_FLAGS $L_FLAGS $MAC_CONFIG_TEST_COMMANDLINE "$@"
} }
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -5362,8 +5361,7 @@ fi
[ "$CFG_XINPUT2" = "yes" ] && QT_CONFIG="$QT_CONFIG xinput2" [ "$CFG_XINPUT2" = "yes" ] && QT_CONFIG="$QT_CONFIG xinput2"
[ '!' -z "$DEFINES" ] && QMakeVar add DEFINES "$DEFINES" [ '!' -z "$DEFINES" ] && QMakeVar add DEFINES "$DEFINES"
[ '!' -z "$L_FLAGS" ] && QMakeVar add QMAKE_LIBDIR_FLAGS "$L_FLAGS" [ '!' -z "$L_FLAGS" ] && QMakeVar add LIBS "$L_FLAGS"
[ '!' -z "$l_FLAGS" ] && QMakeVar add LIBS "$l_FLAGS"
if [ "$PLATFORM_MAC" = "yes" ] && [ "$QT_CROSS_COMPILE" = "no" ]; then if [ "$PLATFORM_MAC" = "yes" ] && [ "$QT_CROSS_COMPILE" = "no" ]; then
if [ "$CFG_RPATH" = "yes" ]; then if [ "$CFG_RPATH" = "yes" ]; then