diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-01-28 13:07:59 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-31 18:26:56 +0100 |
| commit | 1bedb01cc49cadc4f7d01ba8f2020cb73a453ec9 (patch) | |
| tree | af24edc1b541f8870dd301178d7fbfa988764636 | |
| parent | b7d359c66471fb9fe1592d77f8711fe439ac7028 (diff) | |
Don't pollute .prl & .pc files with private dependencies
Also change the creating_module check in needToLink to make sure that
only the main module will try to link directly with the WebCore and
JavaScriptCore static libraries.
Task-number: QTBUG-35774
Initial-patch-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Change-Id: Ib5992e112803679837249400e98cb8c22636096d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| -rw-r--r-- | Source/widgetsapi.pri | 1 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_post.prf | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/widgetsapi.pri b/Source/widgetsapi.pri index 7bdc0e138..335e37114 100644 --- a/Source/widgetsapi.pri +++ b/Source/widgetsapi.pri @@ -49,6 +49,7 @@ use?(3D_GRAPHICS): WEBKIT += ANGLE WEBKIT += javascriptcore wtf webcore MODULE = webkitwidgets +CONFIG += creating_module # We want the QtWebKit API forwarding includes to live in the root build dir. MODULE_BASE_DIR = $$_PRO_FILE_PWD_ diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf index 6fae22fa3..548005d01 100644 --- a/Tools/qmake/mkspecs/features/default_post.prf +++ b/Tools/qmake/mkspecs/features/default_post.prf @@ -171,8 +171,8 @@ contains(QT, webkit)|contains(QT, webkitwidgets) { } defineTest(needToLink) { - # The main dynamic library always needs to link in the intermediate libraries - creating_module: return(true) + # The main module dynamic library always needs to link in the intermediate libraries + isEqual(MODULE, webkit): return(true) force_static_libs_as_shared { # So do the individual libraries if they are dynamic |