forked from qt-creator/qt-creator
Symbian/Linux: Enable building with makefile-based system.
- Autodetect SDK by environment variable EPOCROOT and qt directory below. - Environment::appendOrSet/prependOrSet: Avoid duplicate entries - Rename toolchain enumeration value - Adapt S60ToolChainMixin to new GnuPoc setup, provide routines for all required variables. - RVCTToolChain: Make RVCT detection smarter (Check for RVCT<v1><v2>BIN variable). Set all required variables in case of RVCTToolChain/GnuPoc - QtVersionManager: Detect toolchain and Qt version properly, make S60 device run config accept toolchain. - Modify S60DeviceRunControl to execute 'make sis' - Modify S60Devices::detectQt...() to check for Qt installed into SDK first and symlink as fallback.
This commit is contained in:
@@ -305,13 +305,13 @@ QString Qt4BuildConfiguration::defaultMakeTarget() const
|
||||
|
||||
switch (tc->type()) {
|
||||
case ToolChain::GCCE:
|
||||
case ToolChain::GCCE_GNUPOC:
|
||||
return symbianMakeTarget(buildConfig, QLatin1String("gcce"));
|
||||
case ToolChain::RVCT_ARMV5:
|
||||
return symbianMakeTarget(buildConfig, QLatin1String("armv5"));
|
||||
case ToolChain::RVCT_ARMV6:
|
||||
case ToolChain::RVCT_ARMV6_GNUPOC:
|
||||
return symbianMakeTarget(buildConfig, QLatin1String("armv6"));
|
||||
case ToolChain::RVCT_ARMV5_GNUPOC:
|
||||
case ToolChain::GCCE_GNUPOC:
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user