summaryrefslogtreecommitdiffstats
path: root/configure.pri
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2019-02-05 14:50:22 +0100
committerMichael BrĂ¼ning <michael.bruning@qt.io>2019-02-05 16:56:24 +0100
commit7aa06a1614b7ca6508d96ee2e8ef0f4c49038a6f (patch)
tree4331533a6c0fa7a843c831d66e62472a7f8a4d30 /configure.pri
parent5e92adf5f85c4ec8340d5b7e92166a5e4f8e9883 (diff)
parentf17f815878d1d3f02f464347d2807555cab00a88 (diff)
Merge remote-tracking branch 'origin/dev' into 5.13
Conflicts: src/core/content_browser_client_qt.cpp src/core/content_browser_client_qt.h Change-Id: I3da791a82dab56fd7535ba1e4c0ab1d9ca74f547
Diffstat (limited to 'configure.pri')
-rw-r--r--configure.pri5
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri
index 26c57ce61..46fec536a 100644
--- a/configure.pri
+++ b/configure.pri
@@ -312,3 +312,8 @@ defineTest(qtConfTest_hasThumbFlag) {
# no flag assume mthumb
return(true)
}
+
+defineTest(qtConfTest_hasGcc6OrNewer) {
+ greaterThan(QT_GCC_MAJOR_VERSION, 5):return(true)
+ return(false)
+}