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

Windows: Add Support for Windows SDKs

Browse Source 
Detect SDKs before VC installations. Add static list of installations
initialized on demand. List SDKs and VC with platforms settings
depending on Qt-version. Detect installations properly, checking
existence of setup scripts. Handle delayed shell variable expansion used
by SDK setup scripts. Tested with SDK 6.1 onwards (32bit/64bit).
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
This commit is contained in:
Friedemann Kleint
2010-03-04 15:23:02 +01:00
parent 6d1b08575f
commit d7b927f2d2
5 changed files with 353 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qt4projectmanager/qtoptionspage.cpp
View File

@@ -453,8 +453,9 @@ void QtOptionsPageWidget::showEnvironmentPage(QTreeWidgetItem *item)
makeS60Visible(false);
return;
}
QList<ProjectExplorer::ToolChain::ToolChainType> types = m_versions.at(index)->possibleToolChainTypes();
QSet<QString> targets = m_versions.at(index)->supportedTargetIds();
const QSharedPointerQtVersion qtVersion = m_versions.at(index);
QList<ProjectExplorer::ToolChain::ToolChainType> types = qtVersion->possibleToolChainTypes();
QSet<QString> targets = qtVersion->supportedTargetIds();
if (types.isEmpty()) {
makeMSVCVisible(false);
makeMingwVisible(false);
@@ -473,7 +474,7 @@ void QtOptionsPageWidget::showEnvironmentPage(QTreeWidgetItem *item)
makeMSVCVisible(false);
makeMingwVisible(false);
makeS60Visible(false);
QStringList msvcEnvironments = ProjectExplorer::ToolChain::availableMSVCVersions();
const QStringList msvcEnvironments = ProjectExplorer::ToolChain::availableMSVCVersions(qtVersion->isQt64Bit());
if (msvcEnvironments.count() == 0) {
m_ui->msvcLabel->setVisible(true);
m_ui->msvcNotFoundLabel->setVisible(true);

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

@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>405</width>
<width>431</width>
<height>474</height>
</rect>
</property>
@@ -130,7 +130,7 @@
<item row="3" column="0">
<widget class="QLabel" name="msvcLabel">
<property name="text">
<string>MSVC Version:</string>
<string>Toolchain:</string>
</property>
</widget>
</item>