Rebase patches against latest KDE commit and adapt them to glib2 now using pcre2.
29 lines
756 B
Diff
29 lines
756 B
Diff
From 8eb4ef294239e6d9188dedd7be9b3a3b9cf32d3c Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sun, 18 Sep 2016 14:24:01 +0200
|
|
Subject: [PATCH 12/32] Fix linking against static pcre
|
|
|
|
Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
|
|
---
|
|
src/corelib/text/qregularexpression.cpp | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
|
|
index d7e3cc5ee2..e17c19fbae 100644
|
|
--- a/src/corelib/text/qregularexpression.cpp
|
|
+++ b/src/corelib/text/qregularexpression.cpp
|
|
@@ -53,6 +53,10 @@
|
|
#include <QtCore/qdatastream.h>
|
|
|
|
#define PCRE2_CODE_UNIT_WIDTH 16
|
|
+#ifdef QT_STATIC
|
|
+#define PCRE_STATIC
|
|
+#define PCRE2_STATIC
|
|
+#endif
|
|
|
|
#include <pcre2.h>
|
|
|
|
--
|
|
2.37.3
|
|
|