diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-12-09 18:05:26 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-26 13:29:15 (GMT) |
| commit | e1496ecc0a8e4f753edf22ed39c2179cb0f0f3d8 (patch) | |
| tree | d18e76268c1cf53e11348c040758166899fea39c | |
| parent | e795e61ef93f8080f9938ac49f2fca306644af85 (diff) | |
| download | Qt-e1496ecc0a8e4f753edf22ed39c2179cb0f0f3d8.zip Qt-e1496ecc0a8e4f753edf22ed39c2179cb0f0f3d8.tar.gz Qt-e1496ecc0a8e4f753edf22ed39c2179cb0f0f3d8.tar.bz2 | |
instead of hard-coding recursion for symbian, add it to the specs
Reviewed-by: mariusSO
| -rw-r--r-- | mkspecs/symbian-abld/qmake.conf | 1 | ||||
| -rw-r--r-- | mkspecs/symbian-sbsv2/qmake.conf | 1 | ||||
| -rw-r--r-- | qmake/project.cpp | 4 |
3 files changed, 2 insertions, 4 deletions
diff --git a/mkspecs/symbian-abld/qmake.conf b/mkspecs/symbian-abld/qmake.conf index 499bf63..33b897d 100644 --- a/mkspecs/symbian-abld/qmake.conf +++ b/mkspecs/symbian-abld/qmake.conf @@ -5,5 +5,6 @@ # MAKEFILE_GENERATOR = SYMBIAN_ABLD +option(recursive) include(../common/symbian/symbian.conf) diff --git a/mkspecs/symbian-sbsv2/qmake.conf b/mkspecs/symbian-sbsv2/qmake.conf index 0a5e878..585e645 100644 --- a/mkspecs/symbian-sbsv2/qmake.conf +++ b/mkspecs/symbian-sbsv2/qmake.conf @@ -5,5 +5,6 @@ # MAKEFILE_GENERATOR = SYMBIAN_SBSV2 +option(recursive) include(../common/symbian/symbian.conf) diff --git a/qmake/project.cpp b/qmake/project.cpp index db1db58..274e54a 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -545,10 +545,6 @@ static void init_symbian(const QMap<QString, QStringList>& vars) isForSymbian_value = isForSymbian_FALSE; } } - - // Force recursive on Symbian, as non-recursive is not really a viable option there - if (isForSymbian_value != isForSymbian_FALSE) - Option::recursive = Option::QMAKE_RECURSIVE_YES; } bool isForSymbian() |