diff options
| author | Milian Wolff <milian.wolff@kdab.com> | 2014-08-22 18:39:16 +0200 |
|---|---|---|
| committer | Ashish Kulkarni <kulkarni.ashish@gmail.com> | 2015-01-08 17:51:57 +0100 |
| commit | 6f6582e0310058efddf0bbda842e5ef67754b124 (patch) | |
| tree | 669b38ea6904ed321c5f2d8efe36f4ae3d0f516c | |
| parent | d45d8597cf2563052dab5d2473d2c0dd7cc2a853 (diff) | |
| download | qtwebkit-6f6582e0310058efddf0bbda842e5ef67754b124.tar.gz | |
fix linker errors for the static Windows build
When creating a static QtWebKit on Windows, the define for
STATICALLY_LINKED_WITH_$$library should always be set as otherwise
there will be an attempt to import symbols, which should never be
done and result in errors when linking the final output.
Change-Id: I734e749f5da82de47a1d4b16563978496a0e72ee
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| -rw-r--r-- | Tools/qmake/mkspecs/features/webkit_modules.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/qmake/mkspecs/features/webkit_modules.prf b/Tools/qmake/mkspecs/features/webkit_modules.prf index 005a1bd3d..7040cbbc3 100644 --- a/Tools/qmake/mkspecs/features/webkit_modules.prf +++ b/Tools/qmake/mkspecs/features/webkit_modules.prf @@ -34,7 +34,7 @@ for(library, WEBKIT) { # Anything not linking dynamically to QtWebKit should make sure to have its export # macros synchronized with the code that it will be linked with statically. - !contains(QT, webkit): DEFINES += STATICALLY_LINKED_WITH_$$library + CONFIG(static)|!contains(QT, webkit): DEFINES += STATICALLY_LINKED_WITH_$$library } creating_module { |