diff options
author | Liang Qi <liang.qi@qt.io> | 2017-09-26 16:08:55 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-09-26 16:14:54 +0200 |
commit | aadfe7d634de04519102c5827ca885dc2e2199c9 (patch) | |
tree | d92db346ca95332b177036a53f1f6beb2e24fb74 /configure.json | |
parent | 4b6c1448047362b8c38d265e6414f0e3e59b8d37 (diff) | |
parent | a732e16d5fd9dbf8a0289fec9f948b12e9ba2c19 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/gui/kernel/qguiapplication.cpp
src/platformsupport/input/libinput/qlibinputpointer.cpp
src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
src/plugins/platforms/cocoa/qcocoawindow.h
src/testlib/qtestsystem.h
Change-Id: I5975ffb3261c2dd82fe02ec4e57df7c0950226c5
Diffstat (limited to 'configure.json')
-rw-r--r-- | configure.json | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/configure.json b/configure.json index 803178a597..26e1572f32 100644 --- a/configure.json +++ b/configure.json @@ -61,6 +61,7 @@ "avx2": "boolean", "avx512": { "type": "boolean", "name": "avx512f" }, "c++std": "cxxstd", + "ccache": { "type": "boolean", "name": "ccache" }, "commercial": "void", "compile-examples": { "type": "boolean", "name": "compile_examples" }, "confirm-license": "void", @@ -635,6 +636,11 @@ "label": "IncrediBuild", "type": "files", "files": [ "BuildConsole.exe", "xgConsole.exe" ] + }, + "ccache": { + "label": "ccache", + "type": "files", + "files": [ "ccache" ] } }, @@ -1246,6 +1252,12 @@ "condition": "tests.incredibuild_xge", "output": [ "publicConfig" ] }, + "ccache": { + "label": "Using ccache", + "autoDetect": false, + "condition": "config.unix && tests.ccache", + "output": [ "privateConfig" ] + }, "msvc_mp": { "label": "Use multiple processors when compiling with MSVC", "emitIf": "config.msvc", @@ -1353,6 +1365,11 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5 "type": "firstAvailableFeature", "args": "c++1z c++14 c++11" }, + { + "type": "feature", + "args": "ccache", + "condition": "config.unix" + }, "use_gold_linker", { "type": "feature", |