Merge "Change WIFI_FEATURE_XXX type from int to long" into qt-qpr1-dev