diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-10-14 13:59:41 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-10-14 13:59:41 (GMT) |
| commit | 8e4d6e42629feea38376e429462dc045354f8255 (patch) | |
| tree | 920edc2c789748066170b23085a078603a45b5cd /tools | |
| parent | c19f93eee1219ff91772f34d32b8ff4c20a4341d (diff) | |
| parent | 81bc22dbd71e2dd0e25156e753afc6d94d808de9 (diff) | |
| download | Qt-8e4d6e42629feea38376e429462dc045354f8255.zip Qt-8e4d6e42629feea38376e429462dc045354f8255.tar.gz Qt-8e4d6e42629feea38376e429462dc045354f8255.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index b9f8ed8..f57f3a8 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1465,6 +1465,9 @@ void Configure::applySpecSpecifics() dictionary[ "SQL_SQLITE" ] = "yes"; dictionary[ "SQL_SQLITE_LIB" ] = "system"; + // Disable building docs and translations for now + disabledBuildParts << "docs" << "translations"; + } else if(dictionary[ "XQMAKESPEC" ].startsWith("linux")) { //TODO actually wrong. //TODO dictionary[ "STYLE_WINDOWSXP" ] = "no"; @@ -3717,7 +3720,7 @@ void Configure::readLicense() (dictionary.value("QMAKESPEC").startsWith("wince") || dictionary.value("XQMAKESPEC").startsWith("wince"))) dictionary["PLATFORM NAME"] = "Qt for Windows CE"; else if (dictionary.value("XQMAKESPEC").startsWith("symbian")) - dictionary["PLATFORM NAME"] = "Qt for S60"; + dictionary["PLATFORM NAME"] = "Qt for Symbian"; else dictionary["PLATFORM NAME"] = "Qt for Windows"; dictionary["LICENSE FILE"] = sourcePath; |