summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/symbian
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2009-09-03 02:57:48 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2009-09-03 04:04:14 (GMT)
commit2f43359a21a7d268d367097fc327cc205019cc97 (patch)
tree85c19a270c5fc6adb54a4d8078da064a278b83ff /mkspecs/features/symbian
parent79949af50976373f47d9d7077870359a972c7960 (diff)
downloadQt-2f43359a21a7d268d367097fc327cc205019cc97.zip
Qt-2f43359a21a7d268d367097fc327cc205019cc97.tar.gz
Qt-2f43359a21a7d268d367097fc327cc205019cc97.tar.bz2
Fixed Qt/S60 build failures when MOC_DIR contains a `.' anywhere.
The Symbian build system can't handle directories starting with a `.', so qmake aborts if MOC_DIR and similar start with a `.'. However, the check for this condition was faulty and would include any path which contained a `.' anywhere. Reviewed-by: Michael Goddard
Diffstat (limited to 'mkspecs/features/symbian')
-rw-r--r--mkspecs/features/symbian/moc.prf12
1 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/features/symbian/moc.prf b/mkspecs/features/symbian/moc.prf
index 089dddc..9c21ed7 100644
--- a/mkspecs/features/symbian/moc.prf
+++ b/mkspecs/features/symbian/moc.prf
@@ -1,16 +1,16 @@
load(moc)
-RET = $$find(MOC_DIR, "\.[a-z]")
+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.")
+ 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, "\.[a-z]")
+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.")
+ 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, "\.[a-z]")
+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.")
+ 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")
}