diff options
author | Lars Knoll <lars.knoll@qt.io> | 2017-12-30 17:39:21 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2018-01-02 09:58:44 +0100 |
commit | 0f315adf9199efcfafa44371464ab6d1fc866774 (patch) | |
tree | 35b67591255624c670aff0579e45b2973f56fd81 /configure.pri | |
parent | 2b0eb3fac319a17dd92903106d501f0f06df871f (diff) | |
parent | 52b85212a2ec8ec5bf187f6cd00b669a45bcf0bd (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
sc/corelib/io/qfsfileengine_p.h
src/corelib/io/qstorageinfo_unix.cpp
src/platformsupport/eglconvenience/qeglpbuffer_p.h
src/platformsupport/input/libinput/qlibinputkeyboard.cpp
src/platformsupport/input/libinput/qlibinputpointer.cpp
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/ios/qiosscreen.h
src/plugins/platforms/ios/qioswindow.h
src/plugins/platforms/ios/quiview.mm
src/printsupport/dialogs/qpagesetupdialog_unix_p.h
src/printsupport/dialogs/qprintpreviewdialog.cpp
src/printsupport/widgets/qcupsjobwidget_p.h
src/widgets/widgets/qmenu.cpp
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
Change-Id: Iecb4883122efe97ef0ed850271e6c51bab568e9c
Diffstat (limited to 'configure.pri')
-rw-r--r-- | configure.pri | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/configure.pri b/configure.pri index 8ce4aea9ca..a67860fba0 100644 --- a/configure.pri +++ b/configure.pri @@ -580,7 +580,7 @@ defineTest(qtConfOutput_prepareOptions) { else: \ qtConfFatalError("Cannot detect the Android host." \ "Please use -android-ndk-host option to specify one.") - qtConfAddNotice("Available Android host does not match host architecture.") + qtConfAddNote("Available Android host does not match host architecture.") } } else { !exists($$ndk_tc_pfx/$$ndk_host/*): \ @@ -899,6 +899,19 @@ defineTest(qtConfOutput_shared) { export(CONFIG) } +defineTest(qtConfOutput_sanitizer) { + !$${2}: return() + + # Export this here, so that WebEngine can access it at configure time. + CONFIG += sanitizer + $$qtConfEvaluate("features.sanitize_address"): CONFIG += sanitize_address + $$qtConfEvaluate("features.sanitize_thread"): CONFIG += sanitize_thread + $$qtConfEvaluate("features.sanitize_memory"): CONFIG += sanitize_memory + $$qtConfEvaluate("features.sanitize_undefined"): CONFIG += sanitize_undefined + + export(CONFIG) +} + defineTest(qtConfOutput_architecture) { arch = $$qtConfEvaluate("tests.architecture.arch") buildabi = $$qtConfEvaluate("tests.architecture.buildabi") |