Merge remote-tracking branch 'origin/4.9'

Conflicts:
	src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp
	src/plugins/qmldesigner/qmldesignerextension/timelineeditor/preseteditor.cpp
	src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp
	src/shared/qbs

Change-Id: I369368de9b9c682b03e224d489589043e1f6782b

dist/changes-4.9.1.md

@@ -14,10 +14,18 @@ Editing
 QMake Projects
 
 * Fixed unnecessary reparsing on file save (QTCREATORBUG-22361)
+* Fixed code model for generated files when specified in `.pri` file
+  (QTCREATORBUG-22395)
 
 CMake Projects
 
 * Fixed deployment with `QtCreatorDeployment.txt` (QTCREATORBUG-22184)
+* Fixed that configuration UI was disabled after configuration error
+
+Qbs Projects
+
+* Fixed crash when editing environment variables (QTCREATORBUG-22386)
+* Fixed handling of `cpp.minimum*Version` (QTCREATORBUG-22355)
 
 Debugging
 
@@ -48,6 +56,7 @@ Remote Linux
       (QTCREATORBUG-22352)
 
 Credits for these changes go to:  
+Aaron Barany  
 André Pönitz  
 BogDan Vatra  
 Christian Kandeler  
@@ -59,6 +68,7 @@ Jonathan Liu
 Leena Miettinen  
 Mitch Curtis  
 Nikolai Kosjar  
+Orgad Shaneh  
 Robert Löhning  
 Thomas Hartmann  
 Ulf Hermann  

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml

@@ -103,7 +103,7 @@ Column {
         }
 
         onHasGradientChanged: {
-            if (!supportGradient)
+            if (!colorEditor.supportGradient)
                 return
 
             if (gradientLine.hasGradient) {
@@ -121,8 +121,9 @@ Column {
                     default:
                         buttonRow.initalChecked = 1
                     }
+                } else {
+                    buttonRow.initalChecked = 1
                 }
-
                 colorEditor.color = gradientLine.currentColor
             } else {
                 buttonRow.initalChecked = 0
@@ -216,7 +217,9 @@ Column {
                     iconSource: "images/icon_color_solid.png"
 
                     onClicked: {
+                        if (colorEditor.supportGradient)
                             gradientLine.deleteGradient()
+
                         textField.text = colorEditor.color
                         colorEditor.backendValue.resetValue()
                     }
@@ -511,6 +514,7 @@ Column {
                     iconSource: "images/icon_color_none.png"
                     onClicked: {
                         colorEditor.color = "#00000000"
+                        if (colorEditor.supportGradient)
                             gradientLine.deleteGradient()
                     }
                     tooltip: qsTr("Transparent")

src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp

@@ -349,11 +349,6 @@ void CMakeBuildSettingsWidget::setError(const QString &message)
     m_errorMessageLabel->setVisible(showError);
     m_errorMessageLabel->setText(message);
     m_errorMessageLabel->setToolTip(message);
-
-    m_editButton->setEnabled(!showError);
-    m_unsetButton->setEnabled(!showError);
-    m_resetButton->setEnabled(!showError);
-    m_showAdvancedCheckBox->setEnabled(!showError);
 }
 
 void CMakeBuildSettingsWidget::setWarning(const QString &message)

src/plugins/perforce/perforcechecker.cpp

@@ -175,6 +175,17 @@ static inline QString clientRootFromOutput(const QString &in)
     return QString();
 }
 
+// When p4 port and p4 user is set a preconfigured Root: is given, which doesn't relate with
+// the current mapped project. In this case "Client:" has the same value as "Host:", which is an
+// invalid case.
+static inline bool clientAndHostAreEqual(const QString &in)
+{
+    QString client = findTerm(in, QLatin1String("Client:"));
+    QString host = findTerm(in, QLatin1String("Host:"));
+
+    return client == host;
+}
+
 void PerforceChecker::parseOutput(const QString &response)
 {
     if (!response.contains(QLatin1String("View:")) && !response.contains(QLatin1String("//depot/"))) {
@@ -182,6 +193,12 @@ void PerforceChecker::parseOutput(const QString &response)
         return;
     }
 
+    if (clientAndHostAreEqual(response)) {
+        // Is an invalid case. But not an error. QtC checks cmake install directories for
+        // p4 repositories, or the %temp% directory.
+        return;
+    }
+
     const QString repositoryRoot = clientRootFromOutput(response);
     if (repositoryRoot.isEmpty()) {
         //: Unable to determine root of the p4 client installation

src/plugins/qmldesigner/components/componentcore/crumblebar.cpp

@@ -80,7 +80,7 @@ CrumbleBar::~CrumbleBar()
 
 void CrumbleBar::pushFile(const Utils::FileName &fileName)
 {
-    if (m_isInternalCalled == false) {
+    if (!m_isInternalCalled) {
         crumblePath()->clear();
     } else {
         CrumbleBarInfo lastElementCrumbleBarInfo = crumblePath()->dataForLastIndex().value<CrumbleBarInfo>();

src/plugins/qmldesigner/components/itemlibrary/customfilesystemmodel.cpp

@@ -79,7 +79,7 @@ CustomFileSystemModel::CustomFileSystemModel(QObject *parent) : QAbstractListMod
     m_fileSystemModel->setIconProvider(new ItemLibraryFileIconProvider());
 
     connect(m_fileSystemWatcher, &Utils::FileSystemWatcher::directoryChanged, [this] {
-        setRootPath(m_fileSystemModel->rootPath());
+        updatePath(m_fileSystemModel->rootPath());
     });
 }
 
@@ -88,7 +88,7 @@ void CustomFileSystemModel::setFilter(QDir::Filters)
 
 }
 
-QString filterMetaIcons(const QString &fileName)
+bool filterMetaIcons(const QString &fileName)
 {
 
     QFileInfo info(fileName);
@@ -101,7 +101,7 @@ QString filterMetaIcons(const QString &fileName)
         while (!currentDir.isRoot() && i < 3) {
             if (currentDir.dirName() == "designer") {
                 if (!currentDir.entryList({"*.metainfo"}).isEmpty())
-                    return {};
+                    return false;
             }
 
             currentDir.cdUp();
@@ -109,10 +109,10 @@ QString filterMetaIcons(const QString &fileName)
         }
 
         if (info.dir().dirName() == "designer")
-            return {};
+            return false;
     }
 
-    return fileName;
+    return true;
 }
 
 QModelIndex CustomFileSystemModel::setRootPath(const QString &newPath)
@@ -120,38 +120,7 @@ QModelIndex CustomFileSystemModel::setRootPath(const QString &newPath)
     if (m_fileSystemModel->rootPath() == newPath)
         return QAbstractListModel::index(0, 0);
 
-    beginResetModel();
+    return updatePath(newPath);
-    m_fileSystemModel->setRootPath(newPath);
-
-    m_fileSystemWatcher->removeDirectories(m_fileSystemWatcher->directories());
-
-    m_fileSystemWatcher->addDirectory(newPath, Utils::FileSystemWatcher::WatchAllChanges);
-
-    QStringList nameFilterList;
-
-    const QString searchFilter = m_searchFilter;
-
-    if (searchFilter.contains(QLatin1Char('.'))) {
-        nameFilterList.append(QString(QStringLiteral("*%1*")).arg(searchFilter));
-    } else {
-        foreach (const QByteArray &extension, QImageReader::supportedImageFormats()) {
-            nameFilterList.append(QString(QStringLiteral("*%1*.%2")).arg(searchFilter, QString::fromUtf8(extension)));
-        }
-    }
-
-    m_files.clear();
-
-    QDirIterator fileIterator(newPath, nameFilterList, QDir::Files, QDirIterator::Subdirectories);
-
-    while (fileIterator.hasNext())
-        m_files.append(filterMetaIcons(fileIterator.next()));
-
-    QDirIterator dirIterator(newPath, {}, QDir::Dirs | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
-    while (dirIterator.hasNext())
-        m_fileSystemWatcher->addDirectory(dirIterator.next(), Utils::FileSystemWatcher::WatchAllChanges);
-
-    endResetModel();
-    return QAbstractListModel::index(0, 0);
 }
 
 QVariant CustomFileSystemModel::data(const QModelIndex &index, int role) const
@@ -210,6 +179,48 @@ void CustomFileSystemModel::setSearchFilter(const QString &nameFilterList)
     setRootPath(m_fileSystemModel->rootPath());
 }
 
+void CustomFileSystemModel::appendIfNotFiltered(const QString &file)
+{
+    if (filterMetaIcons(file))
+        m_files.append(file);
+}
+
+QModelIndex CustomFileSystemModel::updatePath(const QString &newPath)
+{
+    beginResetModel();
+    m_fileSystemModel->setRootPath(newPath);
+
+    m_fileSystemWatcher->removeDirectories(m_fileSystemWatcher->directories());
+
+    m_fileSystemWatcher->addDirectory(newPath, Utils::FileSystemWatcher::WatchAllChanges);
+
+    QStringList nameFilterList;
+
+    const QString searchFilter = m_searchFilter;
+
+    if (searchFilter.contains(QLatin1Char('.'))) {
+        nameFilterList.append(QString(QStringLiteral("*%1*")).arg(searchFilter));
+    } else {
+        foreach (const QByteArray &extension, QImageReader::supportedImageFormats()) {
+            nameFilterList.append(QString(QStringLiteral("*%1*.%2")).arg(searchFilter, QString::fromUtf8(extension)));
+        }
+    }
+
+    m_files.clear();
+
+    QDirIterator fileIterator(newPath, nameFilterList, QDir::Files, QDirIterator::Subdirectories);
+
+    while (fileIterator.hasNext())
+        appendIfNotFiltered(fileIterator.next());
+
+    QDirIterator dirIterator(newPath, {}, QDir::Dirs | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
+    while (dirIterator.hasNext())
+        m_fileSystemWatcher->addDirectory(dirIterator.next(), Utils::FileSystemWatcher::WatchAllChanges);
+
+    endResetModel();
+    return QAbstractListModel::index(0, 0);
+}
+
 QModelIndex CustomFileSystemModel::fileSystemModelIndex(const QModelIndex &index) const
 {
     const int row = index.row();

src/plugins/qmldesigner/components/itemlibrary/customfilesystemmodel.h

@@ -61,7 +61,9 @@ public:
     void setSearchFilter(const QString &nameFilterList);
 
 private:
+    QModelIndex updatePath(const QString &newPath);
     QModelIndex fileSystemModelIndex(const QModelIndex &index) const;
+    void appendIfNotFiltered(const QString &file);
 
     QFileSystemModel *m_fileSystemModel;
     QStringList m_files;

src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp

@@ -24,7 +24,9 @@
 ****************************************************************************/
 
 #include "qmlanchorbindingproxy.h"
-#include "abstractview.h"
+
+#include <exception.h>
+#include <abstractview.h>
 #include <qmlanchors.h>
 #include <nodeabstractproperty.h>
 #include <variantproperty.h>
@@ -359,6 +361,7 @@ void QmlAnchorBindingProxy::setTopTarget(const QString &target)
     if (!newTarget.isValid())
         return;
 
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::setTopTarget"));
 
@@ -368,6 +371,11 @@ void QmlAnchorBindingProxy::setTopTarget(const QString &target)
 
         anchorTop();
 
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
+
     emit topTargetChanged();
 }
 
@@ -385,6 +393,7 @@ void QmlAnchorBindingProxy::setBottomTarget(const QString &target)
     if (!newTarget.isValid())
         return;
 
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::setBottomTarget"));
 
@@ -392,6 +401,11 @@ void QmlAnchorBindingProxy::setBottomTarget(const QString &target)
         setDefaultRelativeBottomTarget();
         anchorBottom();
 
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
+
     emit bottomTargetChanged();
 }
 
@@ -408,6 +422,7 @@ void QmlAnchorBindingProxy::setLeftTarget(const QString &target)
     if (!newTarget.isValid())
         return;
 
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::setLeftTarget"));
 
@@ -415,6 +430,11 @@ void QmlAnchorBindingProxy::setLeftTarget(const QString &target)
         setDefaultRelativeLeftTarget();
         anchorLeft();
 
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
+
     emit leftTargetChanged();
 }
 
@@ -431,6 +451,7 @@ void QmlAnchorBindingProxy::setRightTarget(const QString &target)
     if (!newTarget.isValid())
         return;
 
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::setRightTarget"));
 
@@ -438,6 +459,11 @@ void QmlAnchorBindingProxy::setRightTarget(const QString &target)
         setDefaultRelativeRightTarget();
         anchorRight();
 
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
+
     emit rightTargetChanged();
 }
 
@@ -454,12 +480,18 @@ void QmlAnchorBindingProxy::setVerticalTarget(const QString &target)
     if (!newTarget.isValid())
         return;
 
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::setVerticalTarget"));
 
         m_verticalTarget = newTarget;
         anchorVertical();
 
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
+
     emit verticalTargetChanged();
 }
 
@@ -476,11 +508,17 @@ void QmlAnchorBindingProxy::setHorizontalTarget(const QString &target)
     if (!newTarget.isValid())
         return;
 
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::setHorizontalTarget"));
 
         m_horizontalTarget = newTarget;
-    anchorHorizontal();
+        anchorHorizontal();\
+
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
 
     emit horizontalTargetChanged();
 }
@@ -493,6 +531,7 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetTop(QmlAnchorBindingProxy::Re
     if (target == m_relativeTopTarget)
         return;
 
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetTop"));
 
@@ -500,6 +539,11 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetTop(QmlAnchorBindingProxy::Re
 
         anchorTop();
 
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
+
     emit relativeAnchorTargetTopChanged();
 }
 
@@ -511,13 +555,20 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetBottom(QmlAnchorBindingProxy:
     if (target == m_relativeBottomTarget)
         return;
 
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetBottom"));
 
         m_relativeBottomTarget = target;
 
+
         anchorBottom();
 
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
+
     emit relativeAnchorTargetBottomChanged();
 }
 
@@ -529,6 +580,7 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetLeft(QmlAnchorBindingProxy::R
     if (target == m_relativeLeftTarget)
         return;
 
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetLeft"));
 
@@ -536,6 +588,11 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetLeft(QmlAnchorBindingProxy::R
 
         anchorLeft();
 
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
+
     emit relativeAnchorTargetLeftChanged();
 }
 
@@ -547,6 +604,7 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetRight(QmlAnchorBindingProxy::
     if (target == m_relativeRightTarget)
         return;
 
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetRight"));
 
@@ -554,6 +612,11 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetRight(QmlAnchorBindingProxy::
 
         anchorRight();
 
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
+
     emit relativeAnchorTargetRightChanged();
 
 }
@@ -566,6 +629,7 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetVertical(QmlAnchorBindingProx
     if (target == m_relativeVerticalTarget)
         return;
 
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetVertical"));
 
@@ -573,6 +637,11 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetVertical(QmlAnchorBindingProx
 
         anchorVertical();
 
+         transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
+
     emit relativeAnchorTargetVerticalChanged();
 }
 
@@ -584,6 +653,7 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetHorizontal(QmlAnchorBindingPr
     if (target == m_relativeHorizontalTarget)
         return;
 
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetHorizontal"));
 
@@ -591,6 +661,11 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetHorizontal(QmlAnchorBindingPr
 
         anchorHorizontal();
 
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
+
     emit relativeAnchorTargetHorizontalChanged();
 }
 
@@ -635,6 +710,8 @@ int QmlAnchorBindingProxy::indexOfPossibleTargetItem(const QString &targetName)
 }
 
 void QmlAnchorBindingProxy::resetLayout() {
+
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::resetLayout"));
 
@@ -646,6 +723,11 @@ void QmlAnchorBindingProxy::resetLayout() {
         restoreProperty(modelNode(), "width");
         restoreProperty(modelNode(), "height");
 
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
+
         emit topAnchorChanged();
         emit bottomAnchorChanged();
         emit leftAnchorChanged();
@@ -661,6 +743,7 @@ void QmlAnchorBindingProxy::setBottomAnchor(bool anchor)
     if (bottomAnchored() == anchor)
         return;
 
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::setBottomAnchor"));
 
@@ -673,6 +756,11 @@ void QmlAnchorBindingProxy::setBottomAnchor(bool anchor)
                 backupPropertyAndRemove(modelNode(), "height");
         }
 
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
+
     emit relativeAnchorTargetBottomChanged();
     emit bottomAnchorChanged();
 
@@ -688,6 +776,7 @@ void QmlAnchorBindingProxy::setLeftAnchor(bool anchor)
     if (leftAnchored() == anchor)
         return;
 
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::setLeftAnchor"));
 
@@ -702,6 +791,11 @@ void QmlAnchorBindingProxy::setLeftAnchor(bool anchor)
                 backupPropertyAndRemove(modelNode(), "width");
         }
 
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
+
     emit relativeAnchorTargetLeftChanged();
     emit leftAnchorChanged();
     if (hasAnchors() != anchor)
@@ -716,6 +810,7 @@ void QmlAnchorBindingProxy::setRightAnchor(bool anchor)
     if (rightAnchored() == anchor)
         return;
 
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::setRightAnchor"));
 
@@ -729,6 +824,11 @@ void QmlAnchorBindingProxy::setRightAnchor(bool anchor)
                 backupPropertyAndRemove(modelNode(), "width");
         }
 
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
+
     emit relativeAnchorTargetRightChanged();
     emit rightAnchorChanged();
 
@@ -926,6 +1026,7 @@ void QmlAnchorBindingProxy::setTopAnchor(bool anchor)
     if (topAnchored() == anchor)
         return;
 
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::setTopAnchor"));
 
@@ -939,6 +1040,10 @@ void QmlAnchorBindingProxy::setTopAnchor(bool anchor)
             if (bottomAnchored())
                 backupPropertyAndRemove(modelNode(), "height");
         }
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
 
     emit relativeAnchorTargetTopChanged();
     emit topAnchorChanged();
@@ -947,6 +1052,7 @@ void QmlAnchorBindingProxy::setTopAnchor(bool anchor)
 }
 
 void QmlAnchorBindingProxy::removeTopAnchor() {
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::removeTopAnchor"));
 
@@ -956,9 +1062,14 @@ void QmlAnchorBindingProxy::removeTopAnchor() {
         restoreProperty(modelNode(), "y");
         restoreProperty(modelNode(), "height");
 
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
 }
 
 void QmlAnchorBindingProxy::removeBottomAnchor() {
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::removeBottomAnchor"));
 
@@ -967,9 +1078,15 @@ void QmlAnchorBindingProxy::removeBottomAnchor() {
 
 
         restoreProperty(modelNode(), "height");
+
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
 }
 
 void QmlAnchorBindingProxy::removeLeftAnchor() {
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::removeLeftAnchor"));
 
@@ -978,9 +1095,15 @@ void QmlAnchorBindingProxy::removeLeftAnchor() {
 
         restoreProperty(modelNode(), "x");
         restoreProperty(modelNode(), "width");
+
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
 }
 
 void QmlAnchorBindingProxy::removeRightAnchor() {
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::removeRightAnchor"));
 
@@ -988,6 +1111,11 @@ void QmlAnchorBindingProxy::removeRightAnchor() {
         m_qmlItemNode.anchors().removeMargin(AnchorLineRight);
 
         restoreProperty(modelNode(), "width");
+
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
 }
 
 void QmlAnchorBindingProxy::setVerticalCentered(bool centered)
@@ -1000,6 +1128,7 @@ void QmlAnchorBindingProxy::setVerticalCentered(bool centered)
 
     m_locked = true;
 
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::setVerticalCentered"));
 
@@ -1012,6 +1141,10 @@ void QmlAnchorBindingProxy::setVerticalCentered(bool centered)
             anchorVertical();
         }
 
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
     m_locked = false;
 
     emit relativeAnchorTargetVerticalChanged();
@@ -1028,6 +1161,7 @@ void QmlAnchorBindingProxy::setHorizontalCentered(bool centered)
 
     m_locked = true;
 
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::setHorizontalCentered"));
 
@@ -1040,6 +1174,10 @@ void QmlAnchorBindingProxy::setHorizontalCentered(bool centered)
             anchorHorizontal();
         }
 
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
     m_locked = false;
 
     emit relativeAnchorTargetHorizontalChanged();
@@ -1119,6 +1257,7 @@ bool QmlAnchorBindingProxy::horizontalCentered()
 void QmlAnchorBindingProxy::fill()
 {
 
+    try {
         RewriterTransaction transaction = beginRewriterTransaction(
                     QByteArrayLiteral("QmlAnchorBindingProxy::fill"));
 
@@ -1138,6 +1277,11 @@ void QmlAnchorBindingProxy::fill()
         m_qmlItemNode.anchors().removeMargin(AnchorLineTop);
         m_qmlItemNode.anchors().removeMargin(AnchorLineBottom);
 
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+    }
+
     emit topAnchorChanged();
     emit bottomAnchorChanged();
     emit leftAnchorChanged();

src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

@@ -870,6 +870,12 @@ bool NodeMetaInfoPrivate::isPropertyList(const PropertyName &propertyName) const
     const CppComponentValue *qmlObjectValue = getNearestCppComponentValue();
     if (!qmlObjectValue)
         return false;
+
+    if (!qmlObjectValue->hasProperty(QString::fromUtf8(propertyName))) {
+        const TypeName typeName = propertyType(propertyName);
+        return (typeName == "Item"  || typeName == "QtObject");
+    }
+
     return qmlObjectValue->isListProperty(QString::fromUtf8(propertyName));
 }
 

src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineanimationform.cpp

@@ -85,14 +85,23 @@ TimelineAnimationForm::TimelineAnimationForm(QWidget *parent)
         if (newId == animation().id())
             return;
 
-        if (!animation().isValidId(newId)) {
+        bool error = false;
+
+        if (!ModelNode::isValidId(newId)) {
             Core::AsynchronousMessageBox::warning(tr("Invalid Id"),
                                                   tr("%1 is an invalid id.").arg(newId));
+            error = true;
         } else if (animation().view()->hasId(newId)) {
             Core::AsynchronousMessageBox::warning(tr("Invalid Id"),
                                                   tr("%1 already exists.").arg(newId));
         } else {
             animation().setIdWithRefactoring(newId);
+            error = true;
+        }
+
+        if (error) {
+            lastString.clear();
+            ui->idLineEdit->setText(animation().id());
         }
     });
 

src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineform.cpp

@@ -98,15 +98,24 @@ TimelineForm::TimelineForm(QWidget *parent)
         if (newId == m_timeline.modelNode().id())
             return;
 
-        if (!m_timeline.modelNode().isValidId(newId)) {
+        bool error = false;
+
+        if (!ModelNode::isValidId(newId)) {
             Core::AsynchronousMessageBox::warning(tr("Invalid Id"),
                                                   tr("%1 is an invalid id.").arg(newId));
+            error = true;
         } else if (m_timeline.view()->hasId(newId)) {
             Core::AsynchronousMessageBox::warning(tr("Invalid Id"),
                                                   tr("%1 already exists.").arg(newId));
+            error = true;
         } else {
             m_timeline.modelNode().setIdWithRefactoring(newId);
         }
+
+        if (error) {
+            lastString.clear();
+            ui->idLineEdit->setText(m_timeline.modelNode().id());
+        }
     });
 
     connectSpinBox(ui->startFrame, "startFrame");

src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsdialog.cpp

@@ -220,6 +220,7 @@ void TimelineSettingsDialog::setupTimelines(const QmlTimeline &timeline)
     }
 
     setTabForTimeline(ui->timelineTab, m_currentTimeline);
+    setupAnimations(m_currentTimeline);
     m_timelineSettingsModel->resetModel();
 }
 

tests/manual/qml/testprojects/metainfohints/MainForm.ui.qml

@@ -0,0 +1,65 @@
+import QtQuick 2.8
+import QtQuick.Controls 2.1
+import QtQuick.Layouts 1.3
+import Qt.labs.calendar 1.0
+import test 1.0
+
+Item {
+    property alias mouseArea: mouseArea
+    property alias textEdit: textEdit
+
+    width: 360
+    height: 360
+    TestComponent {
+    }
+
+    ForceClip {
+    }
+
+    Rectangle {
+        id: rectangle
+        x: 152
+        y: 65
+        width: 200
+        height: 200
+        color: "#ffffff"
+
+        TestComponent {
+            id: testComponent
+            x: 55
+            y: 35
+            text: qsTr("This is text")
+        }
+    }
+
+    Text {
+        id: text1
+        x: 17
+        y: 133
+        text: qsTr("Text")
+        font.pixelSize: 12
+    }
+
+    TestLayout {
+        id: testLayout
+        x: 8
+        y: 252
+        width: 100
+        height: 100
+
+        CheckBox {
+            id: checkBox
+            text: qsTr("Check Box")
+        }
+
+        CheckBox {
+            id: checkBox1
+            text: qsTr("Check Box")
+        }
+
+        CheckBox {
+            id: checkBox2
+            text: qsTr("Check Box")
+        }
+    }
+}

tests/manual/qml/testprojects/metainfohints/imports/test/ForceClip.qml

@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtQuick.Layouts 1.3
+
+Item {
+    Rectangle {
+        anchors.fill: parent
+        anchors.margins: -100
+    }
+}

tests/manual/qml/testprojects/metainfohints/imports/test/OnlyFormEditor.qml

@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtQuick.Layouts 1.3
+
+Item {
+    default property alias content: layout.children
+    RowLayout {
+        id: layout
+    }
+}

tests/manual/qml/testprojects/metainfohints/imports/test/OnlyNavigator.qml

@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtQuick.Layouts 1.3
+
+Item {
+    default property alias content: layout.children
+    RowLayout {
+        id: layout
+    }
+}

tests/manual/qml/testprojects/metainfohints/imports/test/TestComponent.qml

@@ -0,0 +1,38 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+Rectangle {
+    width: 60
+    height: 60
+    color: "green"
+    property alias text: textItem.text
+
+    Text {
+        id: textItem
+        anchors.centerIn: parent
+    }
+}

tests/manual/qml/testprojects/metainfohints/imports/test/TestLayout.qml

@@ -0,0 +1,30 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtQuick.Layouts 1.3
+
+Item {
+}

tests/manual/qml/testprojects/metainfohints/imports/test/designer/MyPlugin.metainfo

@@ -0,0 +1,143 @@
+MetaInfo {
+    Type {
+        name: "test.TestComponent"
+        icon: ":/qtquickplugin/images/item-icon16.png"
+
+        Hints {
+            canBeContainer: model.potentialChildIsSubclassOf("QtQuick.Text")
+            canBeReparented: model.potentialParentIsSubclassOf("QtQuick.Rectangle")
+            isResizable: false
+            isMovable: !model.currentParentIsSubclassOf("QtQuick.Rectangle");
+        }
+
+        ItemLibraryEntry {
+            name: "Test Component"
+            category: "Test Plugin"
+            libraryIcon: ":/qtquickplugin/images/item-icon.png"
+            version: "1.0"
+            requiredImport: "test"
+
+            Property {
+                name: "text"
+                type: "binding"
+                value: "qsTr(\"This is text\")"
+            }
+        }
+    }
+
+    Type {
+        name: "test.TestLayout"
+        icon: ":/qtquickplugin/images/item-icon16.png"
+
+        Hints {
+            canBeContainer: true
+            doesLayoutChildren: true
+        }
+
+        ItemLibraryEntry {
+            name: "Test Layout"
+            category: "Test Plugin"
+            libraryIcon: ":/qtquickplugin/images/item-icon.png"
+            version: "1.0"
+            requiredImport: "test"
+
+            Property {
+                name: "width"
+                type: "int"
+                value: "100"
+            }
+
+            Property {
+                name: "height"
+                type: "int"
+                value: "100"
+            }
+        }
+    }
+
+     Type {
+        name: "test.OnlyNavigator"
+        icon: ":/qtquickplugin/images/item-icon16.png"
+
+        Hints {
+            canBeDroppedInFormEditor: false
+        }
+
+        ItemLibraryEntry {
+            name: "Only Navigator"
+            category: "Test Plugin"
+            libraryIcon: ":/qtquickplugin/images/item-icon.png"
+            version: "1.0"
+            requiredImport: "test"
+            Property {
+                name: "width"
+                type: "int"
+                value: "100"
+            }
+
+            Property {
+                name: "height"
+                type: "int"
+                value: "100"
+            }
+        }
+    }
+
+    Type {
+        name: "test.OnlyFormEditor"
+        icon: ":/qtquickplugin/images/item-icon16.png"
+
+        Hints {
+            canBeDroppedInNavigator: false
+        }
+
+        ItemLibraryEntry {
+            name: "Only Form Editor"
+            category: "Test Plugin"
+            libraryIcon: ":/qtquickplugin/images/item-icon.png"
+            version: "1.0"
+            requiredImport: "test"
+            Property {
+                name: "width"
+                type: "int"
+                value: "100"
+            }
+
+            Property {
+                name: "height"
+                type: "int"
+                value: "100"
+            }
+        }
+    }
+
+     Type {
+        name: "test.ForceClip"
+        icon: ":/qtquickplugin/images/item-icon16.png"
+
+        Hints {
+            forceClip: true
+        }
+
+        ItemLibraryEntry {
+            name: "Force Clip"
+            category: "Test Plugin"
+            libraryIcon: ":/qtquickplugin/images/item-icon.png"
+            version: "1.0"
+            requiredImport: "test"
+            Property {
+                name: "width"
+                type: "int"
+                value: "100"
+            }
+
+            Property {
+                name: "height"
+                type: "int"
+                value: "100"
+            }
+        }
+    }
+
+
+}

tests/manual/qml/testprojects/metainfohints/imports/test/qmldir

@@ -0,0 +1,5 @@
+TestComponent 1.0 TestComponent.qml
+TestLayout 1.0 TestLayout.qml
+OnlyNavigator 1.0 OnlyNavigator.qml
+OnlyFormEditor 1.0 OnlyFormEditor.qml
+ForceClip 1.0 ForceClip.qml

tests/manual/qml/testprojects/metainfohints/metainfohints.qml

@@ -0,0 +1,13 @@
+import QtQuick 2.8
+import QtQuick.Window 2.2
+
+Window {
+    visible: true
+    width: 640
+    height: 480
+    title: qsTr("Hello World")
+
+    MainForm {
+        anchors.fill: parent
+    }
+}

tests/manual/qml/testprojects/metainfohints/metainfohints.qmlproject

@@ -0,0 +1,18 @@
+import QmlProject 1.1
+
+Project {
+    mainFile: "metainfohints.qml"
+
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+
+    importPaths: [ "imports" ]
+}

tests/system/shared/project.py

@@ -273,22 +273,13 @@ def createProject_Qt_Console(path, projectName, checks = True, buildSystem = Non
     if checks:
         __verifyFileCreation__(path, expectedFiles)
 
-def createNewQtQuickApplication(workingDir, projectName = None,
+def createNewQtQuickApplication(workingDir, projectName=None,
                                 targets=Targets.desktopTargetClasses(), minimumQtVersion="5.6",
-                                withControls = False, fromWelcome = False, buildSystem = None):
+                                template="Qt Quick Application - Empty", fromWelcome=False,
-    if withControls:
+                                buildSystem=None):
-        template = "Qt Quick Application - Swipe"
-    else:
-        template = "Qt Quick Application - Empty"
     available = __createProjectOrFileSelectType__("  Application", template, fromWelcome)
     projectName = __createProjectSetNameAndPath__(workingDir, projectName)
     __handleBuildSystem__(buildSystem)
-    if withControls:
-        requiredQt = "5.7"
-        # TODO use parameter to define style to choose
-        test.log("Using default controls style")
-        clickButton(waitForObject(":Next_QPushButton"))
-    else:
     requiredQt = __createProjectHandleQtQuickSelection__(minimumQtVersion)
     __modifyAvailableTargets__(available, requiredQt)
     checkedTargets = __chooseTargets__(targets, available)

tests/system/shared/workarounds.py

@@ -59,13 +59,6 @@ JIRA_URL='https://bugreports.qt.io/browse'
 class JIRA:
     __instance__ = None
 
-    # internal exception to be used inside workaround functions (lack of having return values)
-    class JiraException(Exception):
-        def __init__(self, value):
-            self.value = value
-        def __str__(self):
-            return repr(self.value)
-
     # Helper class
     class Bug:
         CREATOR = 'QTCREATORBUG'
@@ -93,45 +86,12 @@ class JIRA:
     def __setattr__(self, attr, value):
         return setattr(self.__instance__, attr, value)
 
-    # function to get an instance of the singleton
-    @staticmethod
-    def getInstance():
-        if '_JIRA__instance__' in JIRA.__dict__:
-            return JIRA.__instance__
-        else:
-            return JIRA.__impl(0, Bug.CREATOR)
-
     # function to check if the given bug is open or not
     @staticmethod
     def isBugStillOpen(number, bugType=Bug.CREATOR):
         tmpJIRA = JIRA(number, bugType)
         return tmpJIRA.isOpen()
 
-    # function that performs the workaround (function) for the given bug
-    # if the function needs additional arguments pass them as 3rd parameter
-    @staticmethod
-    def performWorkaroundForBug(number, bugType=Bug.CREATOR, *args):
-        if not JIRA.isBugStillOpen(number, bugType):
-            test.warning("Bug %s-%d is closed for version %s." %
-                         (bugType, number, JIRA(number, bugType)._fix),
-                         "You should probably remove potential code inside workarounds.py")
-        functionToCall = JIRA.getInstance().__bugs__.get("%s-%d" % (bugType, number), None)
-        if functionToCall:
-            test.warning("Using workaround for %s-%d" % (bugType, number))
-            try:
-                functionToCall(*args)
-            except:
-                t, v = sys.exc_info()[0:2]
-                if t == JIRA.JiraException:
-                    raise JIRA.JiraException(v)
-                else:
-                    test.warning("Exception caught while executing workaround function.",
-                                 "%s (%s)" % (str(t), str(v)))
-            return True
-        else:
-            JIRA.getInstance()._exitFatal_(bugType, number)
-            return False
-
     # implementation of JIRA singleton
     class __impl:
         # constructor of __impl
@@ -139,8 +99,6 @@ class JIRA:
             self._number = number
             self._bugType = bugType
             self._fix = None
-            self._localOnly = os.getenv("SYSTEST_JIRA_NO_LOOKUP")=="1"
-            self.__initBugDict__()
             self._fetchResults_ = {}
             self.__fetchResolutionFromJira__()
 
@@ -169,7 +127,6 @@ class JIRA:
                 return
             data = None
             proxy = os.getenv("SYSTEST_PROXY", None)
-            if not self._localOnly:
             try:
                 if proxy:
                     proxy = urllib2.ProxyHandler({'https': proxy})
@@ -184,14 +141,8 @@ class JIRA:
                                  "Try to install the ssl module by yourself, or set the python "
                                  "path inside SQUISHDIR/etc/paths.ini to use a python version with "
                                  "ssl support OR install wget or curl to get rid of this warning!")
-                        self._localOnly = True
             if data == None:
-                if bug in self.__bugs__:
+                test.fatal("No resolution info for %s" % bug)
-                    test.warning("Using internal dict - bug status could have changed already",
-                                 "Please check manually!")
-                    self._resolution = None
-                else:
-                    test.fatal("No workaround function deposited for %s" % bug)
                 self._resolution = 'Done'
             else:
                 data = data.replace("\r", "").replace("\n", "")
@@ -249,14 +200,3 @@ class JIRA:
                          "%s[...]" % fetched[:200])
             else:
                 test.log("Fetched and cropped data: [...]%s[...]" % fetched[resoInd-20:resoInd+100])
-
-        # this function initializes the bug dict for localOnly usage and
-        # for later lookup which function to call for which bug
-        # ALWAYS update this dict when adding a new function for a workaround!
-        def __initBugDict__(self):
-            self.__bugs__= {}
-        # helper function - will be called if no workaround for the requested bug is deposited
-        def _exitFatal_(self, bugType, number):
-            test.fatal("No workaround found for bug %s-%d" % (bugType, number))
-
-############### functions that hold workarounds #################################

tests/system/suite_CSUP/tst_CSUP04/test.py

@@ -53,9 +53,9 @@ def main():
                 return
             test.verify(checkIfObjectExists(":Qt Creator_CppEditor::Internal::CPPEditorWidget"),
                         "Verifying if: .cpp file is opened in Edit mode.")
-            # place cursor on line "QmlApplicationViewer viewer;"
             editorWidget = findObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")
-            # invoke find usages from context menu on word "viewer"
+            # place cursor on line "class TriangleWindow : public OpenGLWindow"
+            # invoke find usages from context menu on word "OpenGLWindow"
             if not invokeFindUsage(editorWidget, "class TriangleWindow : public OpenGLWindow",
                                    "<Left>"):
                 invokeMenuItem("File", "Exit")

tests/system/suite_qtquick/tst_qtquick_creation/test.py

@@ -30,26 +30,20 @@ def main():
     if not startedWithoutPluginError():
         return
 
-    available = [("5.6", False), ("5.6", True)]
+    available = [("5.6", "Qt Quick Application - Empty", Targets.DESKTOP_5_6_1_DEFAULT),
+                 ("5.10", "Qt Quick Application - Swipe", Targets.DESKTOP_5_10_1_DEFAULT)]
 
-    for qtVersion, controls in available:
+    for qtVersion, appTemplate, targ in available:
-        targ = Targets.DESKTOP_5_6_1_DEFAULT
         # using a temporary directory won't mess up a potentially existing
         workingDir = tempDir()
         checkedTargets = createNewQtQuickApplication(workingDir, targets=[targ],
                                                      minimumQtVersion=qtVersion,
-                                                     withControls = controls)[0]
+                                                     template=appTemplate)[0]
         if len(checkedTargets) == 0:
-            if controls and qtVersion < "5.7":
-                test.xfail("Could not check wanted target.", "Quick Controls 2 wizard needs Qt5.7+")
-            else:
             test.fatal("Could not check wanted target")
             continue
-        additionalText = ''
+        test.log("Building project %s (%s)"
-        if controls:
+                 % (appTemplate, Targets.getStringForTarget(targ)))
-            additionalText = ' Controls '
-        test.log("Building project Qt Quick%sApplication (%s)"
-                 % (additionalText, Targets.getStringForTarget(targ)))
         invokeMenuItem("Build", "Build All")
         waitForCompile()
         if not checkCompile():