From eaa3417901d87e5544f3d64c0faa420836361992 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 17 Apr 2018 18:32:30 +0200 Subject: configure: dequote library sources asap the json format uses single strings for library sources, as that leads to less noisy source text. however, this implies the need for de-quoting and subsequent re-quoting whenever the values are processed. so change the internal representation to regular qmake string lists as the first thing when processing the lib source, and re-quote only when outputting the values. CFLAGS are excluded, because we'll deal with them differently. Change-Id: I4ab43d98085ea9f6601fd21ac2afb5bce4f7e2a9 Reviewed-by: Lars Knoll --- src/gui/configure.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gui/configure.pri') diff --git a/src/gui/configure.pri b/src/gui/configure.pri index fcd2d1f73e..b40536e41d 100644 --- a/src/gui/configure.pri +++ b/src/gui/configure.pri @@ -7,7 +7,7 @@ defineTest(qtConfLibrary_freetype) { for (p, TRY_INCLUDEPATHS) { includedir = $$p/freetype2 exists($$includedir) { - $${1}.includedir = "$$val_escape(includedir)" + $${1}.includedir = $$includedir export($${1}.includedir) return(true) } -- cgit v1.2.3