From a2b4705ac66564397f78b416b8c98fe075a3bbd9 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Tue, 31 Jan 2017 11:32:01 +0100
Subject: 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>
---
 src/sql/configure.pri | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/sql')

diff --git a/src/sql/configure.pri b/src/sql/configure.pri
index a8bc09e524..05794582e9 100644
--- a/src/sql/configure.pri
+++ b/src/sql/configure.pri
@@ -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)
-- 
cgit v1.2.3