diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2016-06-06 16:21:33 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2016-06-07 09:21:00 +0000 |
| commit | 9aa726cc581b8bcab309a972f6b7ed157681abd8 (patch) | |
| tree | 1b08032cba01d5c4c1edbd122d33235d4e706698 | |
| parent | e74318bec4d4b227d1284e837e8e1fb1d82bdb4e (diff) | |
| download | qtwebengine-chromium-9aa726cc581b8bcab309a972f6b7ed157681abd8.tar.gz | |
<tools/gyp> FIXUP: Allow letting qmake do the link step
Fix location of Qt5WebEngineCored.pdb.
We must place the PDB into the module's lib directory, next to the DLL.
That is where the install rule expects it.
The original fix for QTBUG-48285 worked only for non-prefix builds.
Task-number: QTBUG-48285
Task-number: QTBUG-52938
Change-Id: If7fe709fbc33fa49850631bcc8fca2e5b6a4f81d
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| -rw-r--r-- | chromium/tools/gyp/pylib/gyp/generator/ninja.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/tools/gyp/pylib/gyp/generator/ninja.py b/chromium/tools/gyp/pylib/gyp/generator/ninja.py index 57589892752..431005cf8be 100644 --- a/chromium/tools/gyp/pylib/gyp/generator/ninja.py +++ b/chromium/tools/gyp/pylib/gyp/generator/ninja.py @@ -1268,7 +1268,7 @@ class NinjaWriter(object): pdb_name = 'Qt5WebEngineCored.pdb' if '/PDB:QtWebEngineCore.dll.pdb' in ldflags: pdb_index = ldflags.index('/PDB:QtWebEngineCore.dll.pdb') - ldflags[pdb_index] = '/PDB:$$shell_quote($$shell_path($$[QT_HOST_LIBS/get]/)' + pdb_name + ')' + ldflags[pdb_index] = '/PDB:$$shell_quote($$shell_path($$MODULE_BASE_OUTDIR/lib/)' + pdb_name + ')' # Replace "$!PRODUCT_DIR" with "$$PWD" in link flags (which might contain some -L directives). prefixed_lflags = [self.ExpandSpecial(f, '$$PWD') for f in ldflags] |