diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-03-06 15:54:22 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-07 18:19:26 +0100 |
| commit | 3c2af9e9e5fe6f90dfa3d4a58bd30d60e0e211a8 (patch) | |
| tree | 475455480bc0db60c654298f7887d558a10e8515 /src/core/core_gyp_generator.pro | |
| parent | 7d371328265a4912fb323779adf95cc922a83541 (diff) | |
Do not pass linking information from qmake to gyp and to qmake again
Instead make sure that the QT and QT_PRIVATE variables are identical
in both core_gyp_generator.pro and core_module.pro, the former for
compilation and the later for linking.
This allows working around issues of qmake when handling -l switches
in libs. Some features on Windows append version numbers, while this
is not done when linking to Qt libraries via the QT variable.
Change-Id: I04b58a313335daeffc9510471553517c63908852
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/core_gyp_generator.pro')
| -rw-r--r-- | src/core/core_gyp_generator.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro index 25e105da6..a2bf2a19c 100644 --- a/src/core/core_gyp_generator.pro +++ b/src/core/core_gyp_generator.pro @@ -7,9 +7,9 @@ GYPINCLUDES += qtwebengine.gypi TEMPLATE = lib -# This must match the target name in core_module.pro to allow it to do the linking part. +# NOTE: The TARGET, QT, QT_PRIVATE variables must match those in core_module.pro. +# gyp/ninja will take care of the compilation, qmake/make will finish with linking and install. TARGET = QtWebEngineCore - QT += qml quick QT_PRIVATE += qml-private quick-private gui-private core-private |