feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Maemo: Disable shadow building on windows again

Browse Source 
Task-Nr: QTCREATORBUG-4255
Reviewed-By: Robert Loehning
This commit is contained in:
dt
2011-03-28 18:32:49 +02:00
parent f1dd01fd29
commit 8839031e60
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
View File

@@ -159,7 +159,11 @@ QList<BuildConfigurationInfo> Qt4MaemoTargetFactory::availableBuildConfiguration
if (!version->isValid() || !version->toolChainAvailable()) if (!version->isValid() || !version->toolChainAvailable())
continue; continue;
QtVersion::QmakeBuildConfigs config = version->defaultBuildConfig(); QtVersion::QmakeBuildConfigs config = version->defaultBuildConfig();
#ifdef Q_OS_WIN
QString dir = QFileInfo(proFilePath).absolutePath();
#else
QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), id); QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), id);
#endif
infos.append(BuildConfigurationInfo(version, config, QString(), dir)); infos.append(BuildConfigurationInfo(version, config, QString(), dir));
infos.append(BuildConfigurationInfo(version, config ^ QtVersion::DebugBuild, QString(), dir)); infos.append(BuildConfigurationInfo(version, config ^ QtVersion::DebugBuild, QString(), dir));
} }

4
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -751,6 +751,10 @@ bool QtVersion::supportsShadowBuilds() const
// We can not support shadow building with the ABLD system // We can not support shadow building with the ABLD system
return false; return false;
} }
#ifdef Q_OS_WIN
if (targets.contains(Constants::MEEGO_DEVICE_TARGET_ID))
return false;
#endif
return true; return true;
} }