forked from qt-creator/qt-creator
qbs updates.
- 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:
committed by
Tobias Hunger
parent
bcb74fa9a4
commit
5728f7e673
@@ -1,4 +1,5 @@
|
|||||||
import qbs.base 1.0
|
import qbs.base 1.0
|
||||||
|
import qbs.TextFile
|
||||||
import qbs.fileinfo as FileInfo
|
import qbs.fileinfo as FileInfo
|
||||||
|
|
||||||
Module {
|
Module {
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import qbs
|
import qbs
|
||||||
|
import qbs.TextFile
|
||||||
|
|
||||||
Product {
|
Product {
|
||||||
name: "app_version_header"
|
name: "app_version_header"
|
||||||
|
|||||||
@@ -489,7 +489,7 @@ void QbsProductNode::setQbsProductData(const qbs::ProductData prd)
|
|||||||
if (m_qbsProductData == prd)
|
if (m_qbsProductData == prd)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
bool productWasEnabled = m_qbsProductData.isEnabled();
|
bool productWasEnabled = m_qbsProductData.isValid() && m_qbsProductData.isEnabled();
|
||||||
bool productIsEnabled = prd.isEnabled();
|
bool productIsEnabled = prd.isEnabled();
|
||||||
bool updateExisting = productWasEnabled != productIsEnabled;
|
bool updateExisting = productWasEnabled != productIsEnabled;
|
||||||
|
|
||||||
|
|||||||
Submodule src/shared/qbs updated: 604aa765a8...6e432eef92
Reference in New Issue
Block a user