summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoenig, Joerg <Joerg.Koenig@techsat.com>2020-04-25 05:22:50 (GMT)
committerKoenig, Joerg <Joerg.Koenig@techsat.com>2020-04-25 05:22:50 (GMT)
commitb3d3b1fc7ac81e11e852a535cf91e87563277290 (patch)
tree08ed7777f2c54d91ade052b3aba7d6dbadc9df91
parent39a1d4ac90160da7cdd8e21e1168bd87bc59361e (diff)
downloadQt-b3d3b1fc7ac81e11e852a535cf91e87563277290.zip
Qt-b3d3b1fc7ac81e11e852a535cf91e87563277290.tar.gz
Qt-b3d3b1fc7ac81e11e852a535cf91e87563277290.tar.bz2
Fixed dllexport patchrefs/changes/78/11078/1
Change-Id: Iee6e3c2c25fe17f3899820854c46d80a468433fd
-rw-r--r--Jenkinsfile2
-rw-r--r--SOURCE/qt-creator-dllexport.patch2
2 files changed, 3 insertions, 1 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 49c1f8a..7fed634 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,6 +3,8 @@ import hudson.model.Result
def REPO = 'ssh://gerrit1.techsat.net:29418/external/Qt'
+script { System.setProperty("org.jenkinsci.plugins.durabletask.BourneShellScript.HEARTBEAT_CHECK_INTERVAL", "86400"); }
+
properties([
parameters([
gitParameter(branch: '',
diff --git a/SOURCE/qt-creator-dllexport.patch b/SOURCE/qt-creator-dllexport.patch
index 090ec84..04b185d 100644
--- a/SOURCE/qt-creator-dllexport.patch
+++ b/SOURCE/qt-creator-dllexport.patch
@@ -6,7 +6,7 @@ diff -ruNb qt-creator-opensource-src-4.11.2.orig/src/libs/sqlite/sqlite.pro qt-c
include(../../qtcreatorlibrary.pri)
-win32:DEFINES += SQLITE_API=__declspec(dllexport)
-+win32:DEFINES += SQLITE_API=__declspec\(dllexport\)
++win32:DEFINES += SQLITE_API=__declspec\\(dllexport\\)
unix:DEFINES += SQLITE_API=\"__attribute__((visibility(\\\"default\\\")))\"
include(sqlite-lib.pri)