diff options
author | Michal Klocek <michal.klocek@qt.io> | 2020-07-27 14:38:24 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2020-07-27 14:07:53 +0000 |
commit | a283bf53c4cc81ec14d19a492c412191394b350c (patch) | |
tree | 4c2353539df2a44773412ec3826fef5e5ab56611 | |
parent | 28ec64afab5b397be05bb75e2c99a35b3f31437d (diff) |
Do not evaluate NINJA_TARGETDEPS
It is just a file path. Fixes qmake linking when chromium changes.
Change-Id: Ib2f0976a6dc3c90c415b69e1876706bc2397d134
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
-rw-r--r-- | src/buildtools/config/linking.pri | 3 | ||||
-rw-r--r-- | src/process/process.pro | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/buildtools/config/linking.pri b/src/buildtools/config/linking.pri index 0ee18f3a5..e4f40ba71 100644 --- a/src/buildtools/config/linking.pri +++ b/src/buildtools/config/linking.pri @@ -71,5 +71,4 @@ linux { QMAKE_LFLAGS += $$NINJA_LFLAGS } -POST_TARGETDEPS += $$eval($$NINJA_TARGETDEPS) - +POST_TARGETDEPS += $$NINJA_TARGETDEPS diff --git a/src/process/process.pro b/src/process/process.pro index 66fdf9797..a90548f9c 100644 --- a/src/process/process.pro +++ b/src/process/process.pro @@ -27,7 +27,7 @@ win32 { LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS $$NINJA_ARCHIVES $$NINJA_OBJECTS QMAKE_LFLAGS += $$NINJA_LFLAGS - POST_TARGETDEPS += $$eval($$NINJA_TARGETDEPS) + POST_TARGETDEPS += $$NINJA_TARGETDEPS CHROMIUM_SRC_DIR = $$QTWEBENGINE_ROOT/$$getChromiumSrcDir() INCLUDEPATH += $$CHROMIUM_SRC_DIR \ |