From 8839031e60e77667ec3dd66c6f9af9c4672f1d57 Mon Sep 17 00:00:00 2001 From: dt Date: Mon, 28 Mar 2011 18:32:49 +0200 Subject: [PATCH] Maemo: Disable shadow building on windows again Task-Nr: QTCREATORBUG-4255 Reviewed-By: Robert Loehning --- .../qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp | 4 ++++ src/plugins/qt4projectmanager/qtversionmanager.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp b/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp index 68c5500099e..c0d0ce2135b 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp @@ -159,7 +159,11 @@ QList 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)); } diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index b4e74c24895..8bef87f6508 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -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; }