Skip to content
  • Liang Qi's avatar
    Merge remote-tracking branch 'origin/5.6' into dev · c7934f24
    Liang Qi authored
    Conflicts:
    	src/corelib/io/qprocess.cpp
    	src/corelib/io/qprocess_unix.cpp
    	src/network/kernel/qnetworkinterface_winrt.cpp
    	tools/configure/configureapp.cpp
    
    Change-Id: I47df00a01597d2e63b334b492b3b4221b29f58ea
    c7934f24