summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/symbian/moc.prf
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-03-19 04:06:02 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-03-19 04:06:02 (GMT)
commitf9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682 (patch)
tree65f3b637a19ff47fcc97e3f22deeae7d843cad17 /mkspecs/features/symbian/moc.prf
parent331ad8eb0aedb4baefcaf6f08a8e0ce440a32b06 (diff)
parent8a7de547942c9a660dfc45c176ea1a3027bbf99a (diff)
downloadQt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.zip
Qt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.tar.gz
Qt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.tar.bz2
Merge remote branch 'origin/4.7' into oslo-staging-1
Conflicts: mkspecs/common/symbian/symbian.conf
Diffstat (limited to 'mkspecs/features/symbian/moc.prf')
-rw-r--r--mkspecs/features/symbian/moc.prf24
1 files changed, 13 insertions, 11 deletions
diff --git a/mkspecs/features/symbian/moc.prf b/mkspecs/features/symbian/moc.prf
index 9c21ed7..29e0d8d 100644
--- a/mkspecs/features/symbian/moc.prf
+++ b/mkspecs/features/symbian/moc.prf
@@ -1,16 +1,18 @@
load(moc)
-RET = $$find(MOC_DIR, "(/|^)\.[^/]+/?$")
-!isEmpty(RET):{
- error("Symbian does not support directories starting with a dot. Please set MOC_DIR to a different value in your profile. MOC_DIR: $$MOC_DIR")
-}
+symbian-abld|symbian-sbsv2 {
+ RET = $$find(MOC_DIR, "(/|^)\.[^/]+/?$")
+ !isEmpty(RET):{
+ error("Symbian does not support directories starting with a dot. Please set MOC_DIR to a different value in your profile. MOC_DIR: $$MOC_DIR")
+ }
-RET = $$find(RCC_DIR, "(/|^)\.[^/]+/?$")
-!isEmpty(RET):{
- error("Symbian does not support directories starting with a dot. Please set RCC_DIR to a different value in your profile. RCC_DIR: $$RCC_DIR")
-}
+ RET = $$find(RCC_DIR, "(/|^)\.[^/]+/?$")
+ !isEmpty(RET):{
+ error("Symbian does not support directories starting with a dot. Please set RCC_DIR to a different value in your profile. RCC_DIR: $$RCC_DIR")
+ }
-RET = $$find(OBJECTS_DIR, "(/|^)\.[^/]+/?$")
-!isEmpty(RET):{
- error("Symbian does not support directories starting with a dot. Please set OBJECTS_DIR to a different value in your profile. OBJECTS_DIR: $$OBJECTS_DIR")
+ RET = $$find(OBJECTS_DIR, "(/|^)\.[^/]+/?$")
+ !isEmpty(RET):{
+ error("Symbian does not support directories starting with a dot. Please set OBJECTS_DIR to a different value in your profile. OBJECTS_DIR: $$OBJECTS_DIR")
+ }
}