whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

work around mysql_config returning denormalized include paths 

"/usr/include/mysql/.." would slip by the removal of default include
directories. so clean up the returned paths first.

Task-number: QTBUG-58532
Change-Id: I445bb15619f6401494e8fffd149ea41a50ef188e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Oswald Buddenhagen 2017-01-31 11:32:01 +01:00
parent 61371f0321
commit a2b4705ac6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sql/configure.pri
View File

@ -67,8 +67,11 @@ defineTest(qtConfLibrary_mysqlConfig) {
libs = $$cleanlibs
}
$${1}.libs = "$$val_escape(libs)"
eval(includedir = $$includedir)
includedir ~= s/^-I//g
eval(rawincludedir = $$includedir)
rawincludedir ~= s/^-I//g
includedir =
for (id, rawincludedir): \
includedir += $$clean_path($$id)
includedir -= $$QMAKE_DEFAULT_INCDIRS
$${1}.includedir = "$$val_escape(includedir)"
export($${1}.libs)