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

QML wizards: Do not offer .ui.qml files for Qt 5.3

Browse Source 
Qt 5.3 is the only version we are going to support that does
not offer ui.qml file support. So just check for the QtQuick
version shipped in Qt 5.3 to decide whether or not to display
the checkbox.

Task-number: QTCREATORBUG-14712
Change-Id: Ibb2204f2bcff819b749e1ed744c14a2e96769351
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-07-13 12:13:18 +02:00
parent 89bc1fc4c4
commit dbe4e32201
7 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/macroexpander.cpp
View File

@@ -274,7 +274,7 @@ QString MacroExpander::expand(const QString &stringWithVariables) const
if (d->m_lockDepth == 0)
d->m_aborted = false;
if (d->m_lockDepth > 3) { // Limit recursion.
if (d->m_lockDepth > 10) { // Limit recursion.
d->m_aborted = true;
return QString();
}