diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-31 11:32:01 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-02 16:08:58 +0000 |
| commit | a2b4705ac66564397f78b416b8c98fe075a3bbd9 (patch) | |
| tree | 60c6803032647a6ccca5c1f7ca98ab8952af32c5 /src/sql | |
| parent | 61371f0321e02b9835baecf4d635925aaf41e307 (diff) | |
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>
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/configure.pri | 7 |
1 files changed, 5 insertions, 2 deletions
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) |