blob: 6d929d1df247bce69d6e91f70439503b9c7d26fa [file] [log] [blame] [edit]
diff -Naur qt-everywhere-src-5.12.4-orig/qtbase/src/corelib/text/qregularexpression.cpp qt-everywhere-src-5.12.4/qtbase/src/corelib/text/qregularexpression.cpp
--- qt-everywhere-src-5.12.4-orig/qtbase/src/corelib/text/qregularexpression.cpp 2019-06-12 23:59:14.000000000 +0300
+++ qt-everywhere-src-5.12.4/qtbase/src/corelib/text/qregularexpression.cpp 2019-06-15 14:59:25.087038500 +0300
@@ -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>
diff -Naur qt-everywhere-src-5.12.4-orig/qtbase/src/network/configure.json qt-everywhere-src-5.12.4/qtbase/src/network/configure.json
--- qt-everywhere-src-5.12.4-orig/qtbase/src/network/configure.json 2019-06-12 23:59:14.000000000 +0300
+++ qt-everywhere-src-5.12.4/qtbase/src/network/configure.json 2019-06-15 14:59:25.102638600 +0300
@@ -92,7 +92,7 @@
"condition": "config.msvc"
},
{
- "libs": "-lssl -lcrypto",
+ "libs": "-lssl -lcrypto -lws2_32 -lcrypt32 -lgdi32",
"condition": "!config.msvc"
}
]