config tests: fix build dir error

This commit is contained in:
LucasWang
2013-03-06 10:54:05 +08:00
parent 30a35a01d5
commit 0efa2d5510
2 changed files with 4 additions and 2 deletions
+1 -1
View File
@@ -51,7 +51,7 @@ greaterThan(QT_MAJOR_VERSION, 5) {
message("cache: $$_QMAKE_CACHE_QT4_")
}
cache(BUILD_DIR, set, BUILD_DIR)
cache(BUILD_ROOT, set, BUILD_DIR)
#cache(BUILD_ROOT, set, BUILD_DIR)
cache(SOURCE_ROOT, set, SOURCE_ROOT)
cache(mkspecs_cached, set, mkspecs_build)
+3 -1
View File
@@ -46,7 +46,9 @@ defineTest(cache) {
#use sed for unix or msys
#convert '/' to '\/' for sed
srcval ~= s,/,\/,g
system("sed -i '/$${srcval}/d' $$_QMAKE_CACHE_QT4_ >/dev/null")
srcval ~= s,\+,\\+,g #for sed regexp. '+' in qmake is '\+' ?
system("sed -i -r '/.*$${dstvar}.*$${srcval}.*/d' $$_QMAKE_CACHE_QT4_ >/dev/null")
message("sed -i -r '/.*$${dstvar}.*$${srcval}.*/d' $$_QMAKE_CACHE_QT4_ >/dev/null")
}
write_file($$_QMAKE_CACHE_QT4_, varstr, append)
}