[automerger skipped] Merge "Fix StrictModeTest#testNonSdkApiUsage" into qt-dev am: 4f179bb174 am: e743aeb922
am:5b95289b71-s ours am skip reason: change_id I6759339000eb239112c0c83ce1131f34164ee0cf with SHA1a7e62a828eis in history Change-Id: I9488b6dd169944fdf4c7b22016d189e064f087a9
This commit is contained in: