forked from qt-creator/qt-creator
Maemo: Disable shadow building on windows again
Task-Nr: QTCREATORBUG-4255 Reviewed-By: Robert Loehning
This commit is contained in:
@@ -159,7 +159,11 @@ QList<BuildConfigurationInfo> Qt4MaemoTargetFactory::availableBuildConfiguration
|
||||
if (!version->isValid() || !version->toolChainAvailable())
|
||||
continue;
|
||||
QtVersion::QmakeBuildConfigs config = version->defaultBuildConfig();
|
||||
#ifdef Q_OS_WIN
|
||||
QString dir = QFileInfo(proFilePath).absolutePath();
|
||||
#else
|
||||
QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), id);
|
||||
#endif
|
||||
infos.append(BuildConfigurationInfo(version, config, QString(), dir));
|
||||
infos.append(BuildConfigurationInfo(version, config ^ QtVersion::DebugBuild, QString(), dir));
|
||||
}
|
||||
|
||||
@@ -751,6 +751,10 @@ bool QtVersion::supportsShadowBuilds() const
|
||||
// We can not support shadow building with the ABLD system
|
||||
return false;
|
||||
}
|
||||
#ifdef Q_OS_WIN
|
||||
if (targets.contains(Constants::MEEGO_DEVICE_TARGET_ID))
|
||||
return false;
|
||||
#endif
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user