diff options
| author | axis <qt-info@nokia.com> | 2010-02-09 09:50:15 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-09 09:50:15 (GMT) |
| commit | 325689d72c77c280f3c5a63a2e4fd2db03f5b304 (patch) | |
| tree | a582a205e8f6b120591a561f3dbb69b091a0699a /mkspecs/common | |
| parent | 31cd89e8139f178e57ebb9a1b81b289b5df5fc69 (diff) | |
| parent | 18c9ecc6a381d77128ef1caf7ab9c2990c7e49f7 (diff) | |
| download | Qt-325689d72c77c280f3c5a63a2e4fd2db03f5b304.zip Qt-325689d72c77c280f3c5a63a2e4fd2db03f5b304.tar.gz Qt-325689d72c77c280f3c5a63a2e4fd2db03f5b304.tar.bz2 | |
Merge branch 'pkgGeneratorForLinux'
Conflicts:
mkspecs/symbian/linux-armcc/features/symbian_building.prf
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/symbian/symbian-makefile.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf index dc428b9..65796b6 100644 --- a/mkspecs/common/symbian/symbian-makefile.conf +++ b/mkspecs/common/symbian/symbian-makefile.conf @@ -2,7 +2,7 @@ # qmake configuration for makefile based symbian # -MAKEFILE_GENERATOR = UNIX +MAKEFILE_GENERATOR = UNIX_SYMBIAN include(symbian.conf) |