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

qbs updates.

Browse Source 
- Make project files buildable with current qbs.
- Update qbs submodule to enable Qt Creator to open these project files.
- Fix an invalid access that caused a soft assert.

Change-Id: I976d19240112d1ff048e51036e6702383735352b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Christian Kandeler
2013-07-05 10:00:19 +02:00
committed by Tobias Hunger
parent bcb74fa9a4
commit 5728f7e673
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsnodes.cpp
View File

@@ -489,7 +489,7 @@ void QbsProductNode::setQbsProductData(const qbs::ProductData prd)
if (m_qbsProductData == prd)
return;
bool productWasEnabled = m_qbsProductData.isEnabled();
bool productWasEnabled = m_qbsProductData.isValid() && m_qbsProductData.isEnabled();
bool productIsEnabled = prd.isEnabled();
bool updateExisting = productWasEnabled != productIsEnabled;