diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2020-07-28 12:29:52 +0200 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2020-07-28 12:29:52 +0200 |
| commit | c60f056562aaba4afeb150c87ed73bc5a4e424d7 (patch) | |
| tree | 7148f96c2d231ed6bdde6c4b7e2affb5d816995b | |
| parent | 54b84e14589b3e51f2f2e7980e2af2559601efe2 (diff) | |
| parent | a283bf53c4cc81ec14d19a492c412191394b350c (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ie9970a657f7693c190405039c9b713e24dbd4041
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/buildtools/config/linking.pri | 3 | ||||
| -rw-r--r-- | src/process/process.pro | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject d61a4348c475ab6867334ef3ab4b5709cae15bb +Subproject 0a4240a9c428d71656637ad4486d92bfeb52af9 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 55b43ecad..eadbcc310 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 \ |