diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-28 11:30:43 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-28 11:30:43 (GMT) |
| commit | a2258116129a1ed715118d90f5097c1aa61f5c98 (patch) | |
| tree | 6d890dca46bc1adb13d274a1823d2ddfd98bbd79 /src | |
| parent | 67f4c288107fd4e7003df6f882143afa8819844b (diff) | |
| parent | a72b61fa95f696a00e7598b12ac1745ff714d756 (diff) | |
| download | Qt-a2258116129a1ed715118d90f5097c1aa61f5c98.zip Qt-a2258116129a1ed715118d90f5097c1aa61f5c98.tar.gz Qt-a2258116129a1ed715118d90f5097c1aa61f5c98.tar.bz2 | |
Merge branch 'master' into 4.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/s60installs/s60installs.pro (renamed from src/s60installs/qt_libs.pro) | 3 | ||||
| -rw-r--r-- | src/src.pro | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/s60installs/qt_libs.pro b/src/s60installs/s60installs.pro index f24a03f..0314958 100644 --- a/src/s60installs/qt_libs.pro +++ b/src/s60installs/s60installs.pro @@ -5,7 +5,8 @@ symbian: { load(data_caging_paths) SUBDIRS= - TARGET = "QtLibs pre-release" + # WARNING: Changing TARGET name will break Symbian SISX upgrade functionality + TARGET = "Qt for S60" TARGET.UID3 = 0x2001E61C VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} 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 |