summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2015-03-20 17:02:15 +0400
committerKonstantin Ritt <ritt.ks@gmail.com>2015-03-20 18:12:09 +0000
commitb5e0e433cc1288f3176474ff49ccfd69b914c194 (patch)
tree000aebf03ca549e1ecec20c179cf3f0d9bc4cbc9 /src/corelib
parent0a275328904b8b66cc80e36b627a48c35b13c205 (diff)
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>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/tools/tools.pri8
1 files changed, 2 insertions, 6 deletions
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