From 056981eb0451d78279551a17adc6404fff9545b0 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 14 Jan 2013 16:04:55 +0100 Subject: Fix shadow build with Qt 5. qmake code copied over from Qt Creator. Change-Id: Ib2100a5dd3a85d7e7b96daac41be4c98bb5d82cb Reviewed-by: Oswald Buddenhagen Reviewed-by: Joerg Bornemann --- static.pro | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'static.pro') diff --git a/static.pro b/static.pro index c4f24f881..bba40c0d3 100644 --- a/static.pro +++ b/static.pro @@ -38,6 +38,11 @@ defineReplace(cleanPath) { } # For use in custom compilers which just copy files +isEqual(QT_MAJOR_VERSION, 5) { +defineReplace(stripSrcDir) { + return($$relative_path($$absolute_path($$1, $$OUT_PWD), $$_PRO_FILE_PWD_)) +} +} else { # qt5 win32:i_flag = i defineReplace(stripSrcDir) { win32 { @@ -46,9 +51,10 @@ defineReplace(stripSrcDir) { !contains(1, ^/.*):1 = $$OUT_PWD/$$1 } out = $$cleanPath($$1) - out ~= s|^$$re_escape($$PWD/)||$$i_flag + out ~= s|^$$re_escape($$_PRO_FILE_PWD_/)||$$i_flag return($$out) } +} # qt5 for(data_dir, DATA_DIRS) { files = $$files($$PWD/$$data_dir/*, true) -- cgit v1.2.1