2018-06-20 16:57:14 +02:00
|
|
|
From 313ee18fb5ba456880fbcfcb5f5d991235094da4 Mon Sep 17 00:00:00 2001
|
2016-09-19 22:18:45 +02:00
|
|
|
From: Martchus <martchus@gmx.net>
|
|
|
|
Date: Sun, 18 Sep 2016 14:24:01 +0200
|
2018-05-23 20:56:49 +02:00
|
|
|
Subject: [PATCH 13/33] Fix linking against static pcre
|
2016-09-19 22:18:45 +02:00
|
|
|
|
2017-06-02 18:20:04 +02:00
|
|
|
Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
|
2016-09-19 22:18:45 +02:00
|
|
|
---
|
|
|
|
src/corelib/tools/qregularexpression.cpp | 4 ++++
|
|
|
|
1 file changed, 4 insertions(+)
|
|
|
|
|
|
|
|
diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
|
2018-05-23 20:56:49 +02:00
|
|
|
index 13eff07c04..ea747244da 100644
|
2016-09-19 22:18:45 +02:00
|
|
|
--- a/src/corelib/tools/qregularexpression.cpp
|
|
|
|
+++ b/src/corelib/tools/qregularexpression.cpp
|
2018-05-23 20:56:49 +02:00
|
|
|
@@ -53,6 +53,10 @@
|
2016-09-19 22:18:45 +02:00
|
|
|
#include <QtCore/qdatastream.h>
|
|
|
|
|
2017-06-02 18:20:04 +02:00
|
|
|
#define PCRE2_CODE_UNIT_WIDTH 16
|
2016-09-19 22:18:45 +02:00
|
|
|
+#ifdef QT_STATIC
|
|
|
|
+#define PCRE_STATIC
|
2017-06-02 18:20:04 +02:00
|
|
|
+#define PCRE2_STATIC
|
2016-09-19 22:18:45 +02:00
|
|
|
+#endif
|
|
|
|
|
2017-06-02 18:20:04 +02:00
|
|
|
#include <pcre2.h>
|
|
|
|
|
2016-09-19 22:18:45 +02:00
|
|
|
--
|
2018-06-20 16:57:14 +02:00
|
|
|
2.18.0
|
2016-09-19 22:18:45 +02:00
|
|
|
|