summaryrefslogtreecommitdiffstats
path: root/configure.pri
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2017-08-31 10:34:25 +0200
committerMichal Klocek <michal.klocek@qt.io>2017-09-12 14:13:17 +0000
commit6bc675d8a7f89cb8c1ce4fc48dfeedcc8028c76f (patch)
treed8914504676a7835b119ab69f4717f331d3df55f /configure.pri
parent7282fb4fb4861320539f2b7288f63e1d4f48749d (diff)
Migrate configuration lefovers to new configure system
Use new configure system for all package detection. Move config test execution to new configure system. However, keep old configure.prf for error hanlding. Split configuration summary into: * optional system libraries used * required system libraries * required system libraries for qpa-xcb (on linux) Change-Id: I5108456caa024a1ada9bb54750693064a2d36f78 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'configure.pri')
-rw-r--r--configure.pri20
1 files changed, 20 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri
index c7ce83bb3..549b1efd0 100644
--- a/configure.pri
+++ b/configure.pri
@@ -116,6 +116,16 @@ defineTest(qtConfTest_detectNinja) {
return(false)
}
+defineTest(qtConfTest_detectProtoc) {
+ protoc = $$qtConfFindInPath("protoc")
+ isEmpty(protoc) {
+ qtLog("Optional protoc could not be found.")
+ return(false)
+ }
+ qtLog("Found protoc from path: $$protoc")
+ return(true)
+}
+
defineTest(qtConfTest_detectGn) {
gn = $$qtConfFindInPath("gn$$EXE_SUFFIX")
!isEmpty(gn) {
@@ -136,3 +146,13 @@ defineTest(qtConfTest_embedded) {
$$qtConfEvaluate("features.cross_compile"): return(true)
return(false)
}
+
+defineTest(qtConfTest_detectIcuuc) {
+ pkgConfig = $$first($$list($$pkgConfigExecutable()))
+ !isEmpty(pkgConfig) {
+ qtRunLoggedCommand("$$pkgConfig --libs --static libxml-2.0", xmllibs)
+ contains(xmllibs,".*-licuuc.*"):return(true)
+ qtLog("System libxml2 is not configured with ICU")
+ }
+ return(false)
+}