aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common/windows
diff options
context:
space:
mode:
authorTuomas Heimonen <tuomas.heimonen@qt.io>2020-01-31 08:22:02 +0200
committerTuomas Heimonen <tuomas.heimonen@qt.io>2020-02-02 10:57:42 +0200
commiteb3d2ed68b655b61846f03721c90eb772584dd6a (patch)
tree9ee1c04bf39d2b88ee3f60d2a51a01f978356399 /coin/provisioning/common/windows
parent311e9abd1e15242a23821189b254524dd56e48ef (diff)
Provisioning: Remove unistd.h from postreSQL from 64 bit Windows
PostreSQL 9.6 version creates emtpy unistd.h file which will cause failure in Qt Safe Renderer' MinGW build. By removing it the system should use the one from the MinGW environment. Task-number: COIN-488 Change-Id: I76d3f34dd9726dc4f0aac06c410f306dffc8f365 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin/provisioning/common/windows')
-rw-r--r--coin/provisioning/common/windows/postgresql.ps11
1 files changed, 1 insertions, 0 deletions
diff --git a/coin/provisioning/common/windows/postgresql.ps1 b/coin/provisioning/common/windows/postgresql.ps1
index 7fcaeb02..27f9190a 100644
--- a/coin/provisioning/common/windows/postgresql.ps1
+++ b/coin/provisioning/common/windows/postgresql.ps1
@@ -58,6 +58,7 @@ if (Is64BitWinHost) {
Remove-Item -Path $packagex64
# Remove pthread.h file so it won't be used in mingw builds (QTBUG-79555)
Remove-item -Path "$installFolder\pgsql\include\pthread.h"
+ Remove-item -Path "$installFolder\pgsql\include\unistd.h"
Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x64" "$installFolder\pgsql\include"
Set-EnvironmentVariable "POSTGRESQL_LIB_x64" "$installFolder\pgsql\lib"