From b5e0e433cc1288f3176474ff49ccfd69b914c194 Mon Sep 17 00:00:00 2001
From: Konstantin Ritt <ritt.ks@gmail.com>
Date: Fri, 20 Mar 2015 17:02:15 +0400
Subject: Build bundled PCRE copy as qt_helper_lib

We already have an infrastructure for that.

Change-Id: I9110b74dcf7f93362586687da6f112e72cb663a4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 src/corelib/tools/tools.pri | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/corelib/tools/tools.pri')

diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index bf20154b56..5de0c09a4d 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -176,14 +176,10 @@ contains(QT_CONFIG,icu) {
 }
 
 !contains(QT_DISABLED_FEATURES, regularexpression) {
+    include($$PWD/../../3rdparty/pcre_dependency.pri)
+
     HEADERS += tools/qregularexpression.h
     SOURCES += tools/qregularexpression.cpp
-
-    pcre {
-        include($$PWD/../../3rdparty/pcre.pri)
-    } else {
-        LIBS_PRIVATE += -lpcre16
-    }
 }
 
 INCLUDEPATH += ../3rdparty/harfbuzz/src
-- 
cgit v1.2.3