2016-12-20 23:05:26 +01:00
|
|
|
From edcc4cad1376de4e843212cca56cb74aa5d7a7dd 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
|
2016-12-05 20:32:16 +01:00
|
|
|
Subject: [PATCH 14/26] Fix linking against static pcre
|
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
|
2016-12-20 23:05:26 +01:00
|
|
|
index e7f86ddf6b..63fc683c68 100644
|
2016-09-19 22:18:45 +02:00
|
|
|
--- a/src/corelib/tools/qregularexpression.cpp
|
|
|
|
+++ b/src/corelib/tools/qregularexpression.cpp
|
|
|
|
@@ -54,6 +54,10 @@
|
|
|
|
#include <QtCore/qatomic.h>
|
|
|
|
#include <QtCore/qdatastream.h>
|
|
|
|
|
|
|
|
+#ifdef QT_STATIC
|
|
|
|
+#define PCRE_STATIC
|
|
|
|
+#endif
|
|
|
|
+
|
|
|
|
#include <pcre.h>
|
|
|
|
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
--
|
2016-12-20 23:05:26 +01:00
|
|
|
2.11.0
|
2016-09-19 22:18:45 +02:00
|
|
|
|