Merge branch 'master' into 1.4

This commit is contained in:
Arin Alexander 2016-11-05 18:12:41 +03:00
commit 0bfff7cb00

View File

@ -413,6 +413,11 @@ template <typename T>
BaseDesignIntf *PageDesignIntf::internalAddBand(T bandType) BaseDesignIntf *PageDesignIntf::internalAddBand(T bandType)
{ {
if (m_insertMode) {
m_insertMode = false;
emit itemInsertCanceled(m_insertItemType);
}
QSet<BandDesignIntf::BandsType> needParentBands; QSet<BandDesignIntf::BandsType> needParentBands;
needParentBands << BandDesignIntf::SubDetailBand needParentBands << BandDesignIntf::SubDetailBand
<< BandDesignIntf::SubDetailHeader << BandDesignIntf::SubDetailHeader