diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-28 06:07:13 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-28 06:10:16 (GMT) |
| commit | 6ae0b4848526719b526443b853bc95aa85cb6cb9 (patch) | |
| tree | 69dd19b99e4e2a0d644983d81fbff1ba5a73523d /src/src.pro | |
| parent | 8c4c7cc111331256b2637e067298e1c93b2e8c3c (diff) | |
| download | Qt-6ae0b4848526719b526443b853bc95aa85cb6cb9.zip Qt-6ae0b4848526719b526443b853bc95aa85cb6cb9.tar.gz Qt-6ae0b4848526719b526443b853bc95aa85cb6cb9.tar.bz2 | |
Various small fixes and cleanups for symbian qmake generator.
The included fixes / cleanups:
- QtLibs PKG filename changed
- Component name in Qt libs pkg changed to "Qt for S60"
* Done in order to make SISX upgrade possible after pre-release.
- Removed passing of 'fixedTarget' member variable as an argument
- Removed whitespaces from generated file names
- Fixed 'make sisx' calling syntax when custom makefile name used
- Fixed MAKEFILE variable content in generated makefiles
- Changed names of environment variables used by 'make sisx'
* Nee variables have 'QT_SISX_' prefix
Reviewed-By: Miikka Heikkinen
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/src.pro b/src/src.pro index feb6a9c..1801d55 100644 --- a/src/src.pro +++ b/src/src.pro @@ -6,8 +6,7 @@ win32:SRC_SUBDIRS += src_winmain wince*:{ SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_testlib } else:symbian { - SRC_SUBDIRS += src_s60main src_corelib src_xml src_gui src_network src_sql src_testlib - SRC_SUBDIRS += $$QT_SOURCE_TREE/src/s60installs/qt_libs.pro + SRC_SUBDIRS += src_s60main src_corelib src_xml src_gui src_network src_sql src_testlib src_s60installs } else { SRC_SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_network src_gui src_sql src_testlib !vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support @@ -37,6 +36,8 @@ SRC_SUBDIRS += src_plugins src_s60main.subdir = $$QT_SOURCE_TREE/src/s60main src_s60main.target = sub-s60main +src_s60installs.subdir = $$QT_SOURCE_TREE/src/s60installs +src_s60installs.target = sub-s60installs src_winmain.subdir = $$QT_SOURCE_TREE/src/winmain src_winmain.target = sub-winmain src_tools_bootstrap.subdir = $$QT_SOURCE_TREE/src/tools/bootstrap |