diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:06:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:54:41 +0200 |
| commit | 6a772fd201ac738dc86e71bd82e98f65158e6335 (patch) | |
| tree | 674007720f41d27b251bbcffd7a368a93f88eb96 /configure.json | |
| parent | 40206a9f6d7635bb19305d1c8d74908808e3529e (diff) | |
| parent | 4c346b6e2bfab976bc9b16275b8382aee38aefa4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
mkspecs/common/msvc-desktop.conf
mkspecs/win32-g++/qmake.conf
mkspecs/win32-icc/qmake.conf
src/platformsupport/fontdatabases/mac/coretext.pri
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: I74a6f7705c9547ed8bbac7260eb4645543e32655
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.json b/configure.json index 349134108b..7a118d860e 100644 --- a/configure.json +++ b/configure.json @@ -500,7 +500,7 @@ }, "use_gold_linker": { "label": "Using gold linker", - "condition": "!config.msvc && !config.integrity && tests.use_gold_linker", + "condition": "!config.win32 && !config.integrity && tests.use_gold_linker", "output": [ "privateConfig", "useGoldLinker" ] }, "optimize_debug": { |