diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-21 17:23:42 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-21 17:23:42 +0100 |
| commit | bfa56c39850f4db30ffe6a5026d8bcf34ebaf3e2 (patch) | |
| tree | 06d9416a2307ba771e09e25441e7272541384da8 /Tools | |
| parent | e9b369b16f5b6070d11888474f1b652db6f4b4e2 (diff) | |
| parent | 5cd506a8e1bcad3d0b414827db51b907e9f4a94b (diff) | |
| download | qtwebkit-bfa56c39850f4db30ffe6a5026d8bcf34ebaf3e2.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: Ib65e8e98ec09b9cc934c8ab7d9f1df3bc377a718
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/qmake/mkspecs/features/configure.prf | 5 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/functions.prf | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf index 0df5ee49e..757ddfe4e 100644 --- a/Tools/qmake/mkspecs/features/configure.prf +++ b/Tools/qmake/mkspecs/features/configure.prf @@ -124,7 +124,10 @@ defineTest(finalizeConfigure) { addReasonForSkippingBuild("ICU is required.") } production_build:blackberry { - addReasonForSkippingBuild("Build not supported on BB10 yet.") + addReasonForSkippingBuild("Build not supported on BB10.") + } + production_build:android { + addReasonForSkippingBuild("Build not supported on Android.") } !gnu_thin_archives:!win32-msvc2013:!mingw:contains(QT_CONFIG, static) { addReasonForSkippingBuild("QtWebKit cannot be built as a static library on this platform. Check your configuration in qtbase/config.summary.") diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf index 9602c2051..dc0c78f97 100644 --- a/Tools/qmake/mkspecs/features/functions.prf +++ b/Tools/qmake/mkspecs/features/functions.prf @@ -269,7 +269,8 @@ defineTest(linkAgainstLibrary) { mac { LIBS += -Wl,-force_load,$${path}$${QMAKE_DIR_SEP}lib$${target}.a } else:win32-msvc*|wince*|win32-icc { - LIBS += /OPT:REF -l$$target + LIBS += -l$$target + QMAKE_LFLAGS += /OPT:REF } else { CONFIG *= no_smart_library_merge LIBS += -Wl,-whole-archive -l$$target -Wl,-no-whole-archive |