lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-03 17:57:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into wip/cmake

Browse Source 
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtdeclarative.yaml
	coin/platform_configs/qtsaferenderer.yaml
	coin/platform_configs/qtsdk.yaml
	coin/provisioning/common/linux/cmake_linux.sh
	coin/provisioning/common/windows/cmake.ps1

Change-Id: I37bb513e3be19e4de4003679f8528677e57c09ee
This commit is contained in:
Simon Hausmann
2019-11-11 10:52:16 +01:00
parent 4e5a86d2bb ae27f21d26
commit c85543f88d
316 changed files with 1958 additions and 28586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/common/unix/install_protobuff.sh
View File

@@ -64,7 +64,7 @@ if uname -a |grep -q Darwin; then
else
./configure
fi
make
make -j5
sudo make install
# Refresh shared library cache if OS isn't macOS