Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable

This commit is contained in:
Frederik Gladhorn
2013-11-26 23:26:26 +01:00
committed by The Qt Project
5 changed files with 60 additions and 2 deletions

View File

@@ -13,7 +13,8 @@ android {
}
qnx {
SUBDIRS += qnx audiocapture
config_mmrenderer: SUBDIRS += qnx
SUBDIRS += audiocapture
}
qnx:!blackberry {