Liang Qi c2d188f225 Merge remote-tracking branch 'origin/5.10' into dev ...

Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Task-number: QTBUG-65688
Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10

2018-01-12 21:13:56 +01:00

..

conan_manifests

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

3dstudio_3rdparty.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

03-conan.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

allow-remote-desktop-access.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

cmake.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

disable-ntp.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

disable-sleep.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

disable-uac.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

disable-windefender.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

disable-windows-updates.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

fbx_windows.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

helpers.ps1

Merge remote-tracking branch 'origin/5.10' into dev

2018-01-12 21:13:56 +01:00

icu.ps1

Merge remote-tracking branch 'origin/5.10' into dev

2018-01-12 21:13:56 +01:00

install-dependencywalker.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

install-git.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

install-jdk.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

install-mingw.ps1

Merge remote-tracking branch 'origin/5.10' into dev

2018-01-12 21:13:56 +01:00

install-notepad++.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

install-ruby.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

install-sevenzip.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

install-strawberry-perl.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

jom.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

libclang.ps1

Merge remote-tracking branch 'origin/5.10' into dev

2018-01-12 21:13:56 +01:00

libusb.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

memorypershell.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

mesa_llvmpipe.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

mqtt_broker.ps1

Merge remote-tracking branch 'origin/5.9' into 5.10

2018-01-11 15:13:13 +01:00

msvc_2015_update3_patch.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

mysql.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

ninja.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

openssl.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

postgresql.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

python3.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

python.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

set-network-test-server.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

vc_redist.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

vulkansdk.ps1

Merge remote-tracking branch 'origin/5.9' into 5.10

2018-01-11 15:13:13 +01:00

winrtrunner.ps1

Merge remote-tracking branch 'origin/5.9' into 5.10

2018-01-11 15:13:13 +01:00

wsearch-off.ps1

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00