diff options
| author | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2015-04-09 00:45:37 (GMT) |
|---|---|---|
| committer | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2015-04-09 22:10:38 (GMT) |
| commit | 90a09c7aedb3036aa1f572a959c67b1f8fcd9e9c (patch) | |
| tree | 40f0be613f12a1461fd2124d375926da6a12de25 | |
| parent | 51e706b1899b3e59f7789bf94184643ccfabeebd (diff) | |
| download | Qt-90a09c7aedb3036aa1f572a959c67b1f8fcd9e9c.zip Qt-90a09c7aedb3036aa1f572a959c67b1f8fcd9e9c.tar.gz Qt-90a09c7aedb3036aa1f572a959c67b1f8fcd9e9c.tar.bz2 | |
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 <oswald.buddenhagen@theqtcompany.com>
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -5575,8 +5575,8 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do [ -z "$CFG_PSQL_CONFIG" ] && CFG_PSQL_CONFIG=`"$WHICH" pg_config` # Be careful not to use native pg_config when cross building. if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x "$CFG_PSQL_CONFIG" ]; then - QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null | filterIncludePath` - QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null | filterLibraryPath` + QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null` + QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null` fi [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" |