Skip to content

Commit 90a09c7

Browse files
committed
Remove filterIncludePath and filterLibraryPath usage.
They are only defined in qt5's configure script. Task-number: QTBUG-45463 Change-Id: Ibce2bd1d06e35de5174b15919c939b41cf013d05 Reviewed-by: Oswald Buddenhagen <[email protected]>
1 parent 51e706b commit 90a09c7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5575,8 +5575,8 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
55755575
[ -z "$CFG_PSQL_CONFIG" ] && CFG_PSQL_CONFIG=`"$WHICH" pg_config`
55765576
# Be careful not to use native pg_config when cross building.
55775577
if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x "$CFG_PSQL_CONFIG" ]; then
5578-
QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null | filterIncludePath`
5579-
QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null | filterLibraryPath`
5578+
QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null`
5579+
QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null`
55805580
fi
55815581
[ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
55825582
[ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"

0 commit comments

Comments
 (0)