diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-03 16:40:30 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-06 20:09:08 +0000 |
| commit | 52d64fca662d0e488801fc40dffdc0a732cfdbd5 (patch) | |
| tree | f50f35fa5df16dca9e43ac95d23cb7c39422dd5d /configure.json | |
| parent | 17b6967f6811cb3adeb8c7eb79a422d2c10ee0d1 (diff) | |
revert to building qmake with qconfig.cpp
turns out that just appending builtin-qt.conf isn't a good idea:
executable-editing tools (objcopy, prelink, etc.) will happily drop the
"attachment".
a safe method would be adding a proper section to the executable, but
there doesn't appear to be an objcopy equivalent in msvc, and using
entirely different methods of embedding the file with different
toolchains seems like a rather bad idea.
so instead go back to the old method of building qmake with a generated
qconfig.cpp. of course, as said file is now created by qmake itself, we
have to compile qlibraryinfo.cpp a second time, and link a second qmake
executable.
Task-number: QTBUG-57803
Change-Id: I9e232693550aa870cec154e49cc06add13017cc2
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/configure.json b/configure.json index 6dffa33289..f9abdae8ca 100644 --- a/configure.json +++ b/configure.json @@ -1,6 +1,5 @@ { "files": { - "builtinQtConf": "qmake/builtin-qt.conf", "qconfigSource": "src/corelib/global/qconfig.cpp", "publicHeader": "src/corelib/global/qconfig.h", "privateHeader": "src/corelib/global/qconfig_p.h", |