diff options
| author | Martchus | 2017-08-09 22:24:26 +0200 |
|---|---|---|
| committer | Martchus | 2017-08-09 22:24:26 +0200 |
| commit | 120bb19dffaad5c818595feaf36e1ca3ebe1de82 (patch) | |
| tree | 792e107a36bdcda4ea7f6769b2e8dbacde6ba716 /0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch | |
| download | aur-120bb19dffaad5c818595feaf36e1ca3ebe1de82.tar.gz | |
Initial import
Diffstat (limited to '0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch')
| -rw-r--r-- | 0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch b/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch new file mode 100644 index 000000000000..d1bd0b185dd8 --- /dev/null +++ b/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch @@ -0,0 +1,37 @@ +From 6a34e383816f0ef74241980e7d712fd51974b40d Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sat, 4 Feb 2017 01:59:59 +0100 +Subject: [PATCH 3/3] Prevent exporting QML parser symbols on static build + +--- + src/qml/parser/qqmljsglobal_p.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/qml/parser/qqmljsglobal_p.h b/src/qml/parser/qqmljsglobal_p.h +index 0e195994b..8aa451e9d 100644 +--- a/src/qml/parser/qqmljsglobal_p.h ++++ b/src/qml/parser/qqmljsglobal_p.h +@@ -56,9 +56,9 @@ + # define QT_QML_BEGIN_NAMESPACE + # define QT_QML_END_NAMESPACE + +-# ifdef QDECLARATIVEJS_BUILD_DIR ++# if defined(QDECLARATIVEJS_BUILD_DIR) && !defined(QT_STATIC) + # define QML_PARSER_EXPORT Q_DECL_EXPORT +-# elif QML_BUILD_STATIC_LIB ++# elif defined(QML_BUILD_STATIC_LIB) || defined(QT_STATIC) + # define QML_PARSER_EXPORT + # else + # define QML_PARSER_EXPORT Q_DECL_IMPORT +@@ -68,7 +68,7 @@ + # define QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE + # define QT_QML_END_NAMESPACE QT_END_NAMESPACE + # ifndef QT_STATIC +-# if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB) ++# if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB) || defined(QT_STATIC) + // QmlDevTools is a static library + # define QML_PARSER_EXPORT + # elif defined(QT_BUILD_QML_LIB) +-- +2.13.2 + |