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_module.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_module.pro')
| -rw-r--r-- | src/core/core_module.pro | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro index 049bd0596..22d3d8646 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -1,5 +1,8 @@ -TARGET = QtWebEngineCore MODULE = webenginecore +TARGET = QtWebEngineCore + +QT += qml quick +QT_PRIVATE += qml-private quick-private gui-private core-private # Look for linking information produced by gyp for our target according to core_generated.gyp !include($$getOutDir()/$$getConfigDir()/$${TARGET}_linking.pri) { |