From b9f218fc84a71fc8b648b0d50bdd3147a13570dd Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 19 Aug 2014 13:14:58 +0200 Subject: [PATCH 01/53] version bump Change-Id: Ieba84f1c8ff1d33af3a6939a10de06848091963e Reviewed-by: Eike Ziller --- qtcreator.pri | 2 +- qtcreator.qbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtcreator.pri b/qtcreator.pri index a9dd72f8b33..795ee8a4cc9 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -1,7 +1,7 @@ !isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included") QTCREATOR_PRI_INCLUDED = 1 -QTCREATOR_VERSION = 3.2.0 +QTCREATOR_VERSION = 3.2.1 QTCREATOR_COMPAT_VERSION = 3.2.0 BINARY_ARTIFACTS_BRANCH = 3.2 diff --git a/qtcreator.qbs b/qtcreator.qbs index efdf665efd3..f5f7fac683a 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -5,7 +5,7 @@ Project { property bool withAutotests: qbs.buildVariant === "debug" property string ide_version_major: '3' property string ide_version_minor: '2' - property string ide_version_release: '0' + property string ide_version_release: '1' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release property string ide_compat_version_major: '3' property string ide_compat_version_minor: '2' From c31b5c40913bebeb8fa35deb97943b49bab5429b Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Wed, 20 Aug 2014 14:18:01 +0200 Subject: [PATCH 02/53] Fix typo Change-Id: Ie0b6695717c0d032fb3e27ef873d7b01a24ac84d Reviewed-by: Leena Miettinen --- src/plugins/clangcodemodel/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/clangcodemodel/README b/src/plugins/clangcodemodel/README index 86121132708..27985197987 100644 --- a/src/plugins/clangcodemodel/README +++ b/src/plugins/clangcodemodel/README @@ -50,7 +50,7 @@ qmake and rebuild Qt Creator. Watch out for a message like Project MESSAGE: INCLUDEPATH += /usr/lib/llvm-3.4/include Project MESSAGE: LIBS += -L/usr/lib/llvm-3.4/lib -lclang -This indicates that the ClangCodeModel plugin will be build. +This indicates that the ClangCodeModel plugin will be built. Enable the plugin ----------------- From 058507d37eb32e130d2831e08f1f5fd4d4c96a7c Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Wed, 20 Aug 2014 16:40:58 +0200 Subject: [PATCH 03/53] qmljs: adding getDay and getUTCDay to date object Change-Id: Ib7a15a7e3803656b2091e25a12a7fd13000553ab Reviewed-by: Eike Ziller Reviewed-by: Tim Jenssen --- src/libs/qmljs/qmljsvalueowner.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libs/qmljs/qmljsvalueowner.cpp b/src/libs/qmljs/qmljsvalueowner.cpp index 644b0c09ed7..41cd4b21210 100644 --- a/src/libs/qmljs/qmljsvalueowner.cpp +++ b/src/libs/qmljs/qmljsvalueowner.cpp @@ -365,6 +365,8 @@ SharedValueOwner::SharedValueOwner(SharedValueOwnerKind kind) addFunction(_datePrototype, QLatin1String("getTime"), numberValue(), 0); addFunction(_datePrototype, QLatin1String("getFullYear"), numberValue(), 0); addFunction(_datePrototype, QLatin1String("getUTCFullYear"), numberValue(), 0); + addFunction(_datePrototype, QLatin1String("getDay"), numberValue(), 0); + addFunction(_datePrototype, QLatin1String("getUTCDay"), numberValue(), 0); addFunction(_datePrototype, QLatin1String("getMonth"), numberValue(), 0); addFunction(_datePrototype, QLatin1String("getUTCMonth"), numberValue(), 0); addFunction(_datePrototype, QLatin1String("getDate"), numberValue(), 0); From b7c8d07a8d9223c2e8ee098c1c7dde0a4b512e49 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 18 Aug 2014 14:13:33 +0200 Subject: [PATCH 04/53] OSX: Get rid of File > Exit menu item Seems to be a behavior change between Qt 5.2 and Qt 5.3. Now we need to set the menu role explicitly, text heuristic fails. Change-Id: I54ecfea5910db4863699bb077b8f8a6c88b56237 Reviewed-by: Erik Verbruggen Reviewed-by: Fawzi Mohamed --- src/plugins/coreplugin/mainwindow.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index da19097ea45..bcdc9f45988 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -554,6 +554,7 @@ void MainWindow::registerDefaultActions() m_exitAction = new QAction(icon, tr("E&xit"), this); cmd = ActionManager::registerAction(m_exitAction, Constants::EXIT, globalContext); cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Q"))); + cmd->action()->setMenuRole(QAction::QuitRole); mfile->addAction(cmd, Constants::G_FILE_OTHER); connect(m_exitAction, SIGNAL(triggered()), this, SLOT(exit())); From 6d70418e2ceddc6433223ef17e5cac73a09dbbdf Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Wed, 20 Aug 2014 16:18:02 +0200 Subject: [PATCH 05/53] CppTools: Remove concurrent write access to diagnostic messages ...in CheckSymbols (highlighting backend). CheckSymbols might run concurrently several times with the same CPlusPlus::Document and modify the diagnostic messages in an unsave manner. See stack straces below. While the generated diagnostic messages ("Only virtual functions can be marked 'final'", "Too few arguments", ...) are useful, they weren't propagated to the editor widget since several minor versions. ================================================================= ==23724==ERROR: AddressSanitizer: attempting double-free on 0x60c0072fcd00 in thread T528 (Thread (pooled)): #0 0x4787c1 in __interceptor_free (/home/nik/dev/creator/creator-ut_clang-qt5/bin/qtcreator+0x4787c1) #1 0x7fa15e5da4ac in QTypedArrayData::deallocate(QArrayData*) /home/nik/usr/qt-5.3.1/include/QtCore/qarraydata.h:234 #2 0x7fa15e5d87db in QString::~QString() /home/nik/usr/qt-5.3.1/include/QtCore/qstring.h:995 #3 0x7fa15e5f4f6a in CPlusPlus::Document::DiagnosticMessage::~DiagnosticMessage() /home/nik/dev/creator/creator-ut/src/libs/cplusplus/CppDocument.h:140 #4 0x7fa15e5f4de2 in QList::node_destruct(QList::Node*, QList::Node*) /home/nik/usr/qt-5.3.1/include/QtCore/qlist.h:432 #5 0x7fa15e5f4ae9 in QList::dealloc(QListData::Data*) /home/nik/usr/qt-5.3.1/include/QtCore/qlist.h:784 #6 0x7fa15e5f47ed in QList::~QList() /home/nik/usr/qt-5.3.1/include/QtCore/qlist.h:760 #7 0x7fa15e7533c2 in QList::clear() /home/nik/usr/qt-5.3.1/include/QtCore/qlist.h:793 #8 0x7fa15e6f2ed2 in CPlusPlus::Document::clearDiagnosticMessages() /home/nik/dev/creator/creator-ut/src/libs/cplusplus/CppDocument.h:205 #9 0x7fa15e6c5f5b in CppTools::CheckSymbols::run() /home/nik/dev/creator/creator-ut/src/plugins/cpptools/cppchecksymbols.cpp:337 #10 0x7fa15e6c83c2 in non-virtual thunk to CppTools::CheckSymbols::run() /home/nik/dev/creator/creator-ut/src/plugins/cpptools/cppchecksymbols.cpp:348 #11 0x7fa17f0ccab1 (/home/nik/usr/qt-5.3.1/lib/libQt5Core.so.5+0x98ab1) #12 0x7fa17f0cfa5e (/home/nik/usr/qt-5.3.1/lib/libQt5Core.so.5+0x9ba5e) #13 0x7fa17eaeb181 in start_thread (/lib/x86_64-linux-gnu/libpthread.so.0+0x8181) #14 0x7fa17dbec38c (/lib/x86_64-linux-gnu/libc.so.6+0xfb38c) 0x60c0072fcd00 is located 0 bytes inside of 128-byte region [0x60c0072fcd00,0x60c0072fcd80) freed by thread T539 (Thread (pooled)) here: #0 0x4787c1 in __interceptor_free (/home/nik/dev/creator/creator-ut_clang-qt5/bin/qtcreator+0x4787c1) #1 0x7fa15e5da4ac in QTypedArrayData::deallocate(QArrayData*) /home/nik/usr/qt-5.3.1/include/QtCore/qarraydata.h:234 #2 0x7fa15e5d87db in QString::~QString() /home/nik/usr/qt-5.3.1/include/QtCore/qstring.h:995 #3 0x7fa15e5f4f6a in CPlusPlus::Document::DiagnosticMessage::~DiagnosticMessage() /home/nik/dev/creator/creator-ut/src/libs/cplusplus/CppDocument.h:140 #4 0x7fa15e5f4de2 in QList::node_destruct(QList::Node*, QList::Node*) /home/nik/usr/qt-5.3.1/include/QtCore/qlist.h:432 #5 0x7fa15e5f4ae9 in QList::dealloc(QListData::Data*) /home/nik/usr/qt-5.3.1/include/QtCore/qlist.h:784 #6 0x7fa15e5f47ed in QList::~QList() /home/nik/usr/qt-5.3.1/include/QtCore/qlist.h:760 #7 0x7fa15e7533c2 in QList::clear() /home/nik/usr/qt-5.3.1/include/QtCore/qlist.h:793 #8 0x7fa15e6f2ed2 in CPlusPlus::Document::clearDiagnosticMessages() /home/nik/dev/creator/creator-ut/src/libs/cplusplus/CppDocument.h:205 #9 0x7fa15e6c5f5b in CppTools::CheckSymbols::run() /home/nik/dev/creator/creator-ut/src/plugins/cpptools/cppchecksymbols.cpp:337 #10 0x7fa15e6c83c2 in non-virtual thunk to CppTools::CheckSymbols::run() /home/nik/dev/creator/creator-ut/src/plugins/cpptools/cppchecksymbols.cpp:348 Change-Id: Ifab2842ea43aeb26099835966b02d8afc4b85df4 Reviewed-by: Erik Verbruggen --- src/plugins/cpptools/cppchecksymbols.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/cpptools/cppchecksymbols.cpp b/src/plugins/cpptools/cppchecksymbols.cpp index 4f528d47d6f..4cdf02dfbe7 100644 --- a/src/plugins/cpptools/cppchecksymbols.cpp +++ b/src/plugins/cpptools/cppchecksymbols.cpp @@ -332,7 +332,9 @@ void CheckSymbols::run() _potentialStatics = collectTypes.statics(); Utils::sort(_macroUses, sortByLinePredicate); - _doc->clearDiagnosticMessages(); + // TODO: Handle concurrent (write) access of diagnostic messages and ensure + // propagation to the editor widget +// _doc->clearDiagnosticMessages(); if (!isCanceled()) { if (_doc->translationUnit()) { @@ -348,7 +350,9 @@ void CheckSymbols::run() bool CheckSymbols::warning(unsigned line, unsigned column, const QString &text, unsigned length) { Document::DiagnosticMessage m(Document::DiagnosticMessage::Warning, _fileName, line, column, text, length); - _doc->addDiagnosticMessage(m); + // TODO: Handle concurrent (write) access of diagnostic messages and ensure + // propagation to the editor widget +// _doc->addDiagnosticMessage(m); return false; } From 1a690d4b9594dd2d3ad282af81429dbb327153ec Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 7 Aug 2014 10:27:27 +0200 Subject: [PATCH 06/53] QmlDesigner.PropertyEditor: Fix caption Change-Id: I118018c39506600386ff54c92b7ef669c0a279ff Reviewed-by: Tim Jenssen --- .../qmldesigner/componentsplugin/Controls/TabViewSpecifics.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/componentsplugin/Controls/TabViewSpecifics.qml b/src/plugins/qmldesigner/componentsplugin/Controls/TabViewSpecifics.qml index 85f1c21066a..5ce74617ca9 100644 --- a/src/plugins/qmldesigner/componentsplugin/Controls/TabViewSpecifics.qml +++ b/src/plugins/qmldesigner/componentsplugin/Controls/TabViewSpecifics.qml @@ -39,7 +39,7 @@ Column { Section { anchors.left: parent.left anchors.right: parent.right - caption: qsTr("TabView") + caption: qsTr("Tab View") SectionLayout { From b6e6e0123c0a442ffd7b8bcafb1e13567979e2fb Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 21 Aug 2014 13:34:22 +0200 Subject: [PATCH 07/53] QmlDesigner.NodeInstances: Fixing enums for int properties There is no easy way to convert an enum (e.g. Qt.Vertical) to the integer value without the meta object/QMetaEnum. For this reason we evluate the enum as an expression if the target property is int. Without this patch enums do not work at all for properties defined as int. Change-Id: I9363a84eef1bf4a3ed2c40b35f7439e249e9bd98 Reviewed-by: Tim Jenssen --- .../instances/objectnodeinstance.cpp | 75 ++++++++----------- .../qml2puppet/instances/objectnodeinstance.h | 1 + 2 files changed, 34 insertions(+), 42 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp index 307feedd72d..fb5476883a9 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp @@ -53,6 +53,7 @@ #include #include #include +#include #include @@ -102,8 +103,6 @@ static bool isSimpleExpression(const QString &expression) namespace QmlDesigner { namespace Internal { -QHash ObjectNodeInstance::m_enumationValueHash; - ObjectNodeInstance::ObjectNodeInstance(QObject *object) : m_object(object), m_metaObject(0), @@ -474,6 +473,37 @@ PropertyNameList ObjectNodeInstance::ignoredProperties() const return PropertyNameList(); } +QVariant ObjectNodeInstance::convertEnumToValue(const QVariant &value, const PropertyName &name) +{ + int idx = object()->metaObject()->indexOfProperty(name); + QMetaProperty metaProperty = object()->metaObject()->property(idx); + + QVariant fixedValue = fixResourcePaths(value); + + if (value.canConvert()) { + Enumeration enumeration = value.value(); + if (metaProperty.isValid() && metaProperty.isEnumType()) { + fixedValue = metaProperty.enumerator().keyToValue(enumeration.name()); + } else if (metaProperty.isValid() + && (QLatin1String(metaProperty.typeName()) == QLatin1String("int"))) { + + //If the target property is an integer handle an enum as binding + QQmlExpression expression(context(), object(), enumeration.toString()); + fixedValue = expression.evaluate(); + if (expression.hasError()) + qDebug() << "Enum can not be evaluated:" << object() << name << enumeration; + } else if (!metaProperty.isValid()) { //In this case this is most likely an attached property + QQmlExpression expression(context(), object(), enumeration.toString()); + fixedValue = expression.evaluate(); + + if (expression.hasError()) + qDebug() << "Enum can not be evaluated:" << object() << name << enumeration; + } + } + + return fixedValue; +} + void ObjectNodeInstance::setPropertyVariant(const PropertyName &name, const QVariant &value) { if (ignoredProperties().contains(name)) @@ -485,9 +515,7 @@ void ObjectNodeInstance::setPropertyVariant(const PropertyName &name, const QVar return; QVariant fixedValue = fixResourcePaths(value); - - if (value.canConvert()) - fixedValue = enumationValue(value.value()); + fixedValue = convertEnumToValue(fixedValue, name); QVariant oldValue = property.read(); if (oldValue.type() == QVariant::Url) { @@ -1342,43 +1370,6 @@ void ObjectNodeInstance::doComponentCompleteRecursive(QObject *object, NodeInsta } } -static QHash enumationValuesFromMetaEnum(const QMetaEnum &metaEnum) -{ - QHash enumationValues; - for (int index = 0; index < metaEnum.keyCount(); index++) { - EnumerationName enumerationName = EnumerationName(metaEnum.scope()) + "." + metaEnum.key(index); - enumationValues.insert(enumerationName, QVariant::fromValue(metaEnum.value(index))); - qDebug() << __FUNCTION__ << enumerationName << metaEnum.value(index); - } - - return enumationValues; -} - -static QHash collectEnumationValues(const Enumeration &enumeration) -{ - QHash enumationValues; - EnumerationName enumerationScope = enumeration.scope(); - const QMetaObject *metaObject = QMetaType::metaObjectForType(QMetaType::type(enumerationScope.constData())); - if (metaObject) { - int enumeratorCount = metaObject->enumeratorOffset() + metaObject->enumeratorCount(); - for (int index = metaObject->enumeratorOffset(); index < enumeratorCount; index++) - enumationValues.unite(enumationValuesFromMetaEnum(metaObject->enumerator(index))); - } else { - enumationValues.insert(enumeration.toEnumerationName(), QVariant::fromValue(enumeration.nameToString())); - } - - return enumationValues; -} - -QVariant ObjectNodeInstance::enumationValue(const Enumeration &enumeration) -{ - EnumerationName enumerationName = enumeration.toEnumerationName(); - if (!m_enumationValueHash.contains(enumerationName)) - m_enumationValueHash.unite(collectEnumationValues(enumeration)); - - return m_enumationValueHash.value(enumerationName); -} - ObjectNodeInstance::Pointer ObjectNodeInstance::parentInstance() const { QObject *parentHolder = parent(); diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h index 239b7744912..ef837e5e5a7 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h @@ -200,6 +200,7 @@ protected: void addToNewProperty(QObject *object, QObject *newParent, const PropertyName &newParentProperty); void deleteObjectsInList(const QQmlProperty &metaProperty); QVariant convertSpecialCharacter(const QVariant& value) const; + QVariant convertEnumToValue(const QVariant &value, const PropertyName &name); static QObject *parentObject(QObject *object); static void doComponentCompleteRecursive(QObject *object, NodeInstanceServer *nodeInstanceServer); static QVariant enumationValue(const Enumeration &enumeration); From fb87aa97bd162b482a9eb67fe24c7059d5c13bfd Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 15 Aug 2014 13:52:39 +0200 Subject: [PATCH 08/53] QmlDesigner.PropertyEditor: Commit color string if selection changes The LineEdit in the ColorEditor is not binded to a backendvalue and we react manually to isAccepted (writeValueManually is set to true). Because of this (and the famous focus bugs), we do not set the color, if the selection is changed or the user enters edit mode without pressing enter. This patch adds the signal onCommitData to LineEdit and we react to the signal. Because the the change of the backendvalue is delayed by a timer we set the color immediately on the backend if we are not in gradient editing mode. Task-number: QTCREATORBUG-12841 Change-Id: Ic98640398c2c46b5e529780b4a9638c90760063f Reviewed-by: Tim Jenssen --- .../HelperWidgets/ColorEditor.qml | 12 +++++++++++- .../HelperWidgets/LineEdit.qml | 5 +++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml index aa4b76edfe5..6fe7636fad5 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml @@ -50,6 +50,10 @@ Column { property alias gradientPropertyName: gradientLine.gradientPropertyName + function isNotInGradientMode() { + return (buttonRow.checkedIndex !== 1) + } + onValueChanged: { colorEditor.color = colorEditor.value } @@ -78,7 +82,7 @@ Column { gradientLine.currentColor = color } - if (buttonRow.checkedIndex !== 1) { + if (isNotInGradientMode()) { //Delay setting the color to keep ui responsive colorEditorTimer.restart() } @@ -170,6 +174,12 @@ Column { colorEditor.color = colorFromString(textField.text) } + onCommitData: { + colorEditor.color = colorFromString(textField.text) + if (isNotInGradientMode()) + backendendValue.value = colorEditor.color + } + Layout.fillWidth: true } ColorCheckButton { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml index 9cea91a9e5c..1f5dd2aad78 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml @@ -53,6 +53,8 @@ Controls.TextField { property bool showExtendedFunctionButton: true + signal commitData + ExtendedFunctionButton { x: 2 y: 4 @@ -82,7 +84,10 @@ Controls.TextField { onSelectionToBeChanged: { if (__dirty && !writeValueManually) { lineEdit.backendValue.value = text + } else if (__dirty) { + commitData() } + __dirty = false } } From ecf96013aeb4d279d53588b522b9f6f09ddd2b86 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 20 Aug 2014 12:16:04 +0200 Subject: [PATCH 09/53] QmlDesigner.Rewriter: Adding missing global Qt enums Change-Id: Ie29a089aad130dfe86313aaa47ebf66fb7611a25 Reviewed-by: Tim Jenssen --- .../qmldesigner/designercore/model/texttomodelmerger.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index c818a7e08d8..97001954277 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -74,7 +74,8 @@ static inline QStringList supportedVersionsList() static inline QStringList globalQtEnums() { static QStringList list = QStringList() << QStringLiteral("Horizontal") << QStringLiteral("Vertical") << QStringLiteral("AlignVCenter") - << QStringLiteral("AlignLeft") << QStringLiteral("LeftToRight") << QStringLiteral("RightToLeft") + << QStringLiteral("AlignLeft") << QStringLiteral("LeftToRight") << QStringLiteral("RightToLeft") << QStringLiteral("AlignHCenter") + << QStringLiteral("AlignRight") << QStringLiteral("AlignBottom") << QStringLiteral("AlignBaseline") << QStringLiteral("AlignTop") << QStringLiteral("BottomLeft") << QStringLiteral("LeftEdge") << QStringLiteral("RightEdge") << QStringLiteral("BottomEdge"); return list; From 73a63707b3db844d9adb9a1a897d5bab9b443153 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 20 Aug 2014 12:27:46 +0200 Subject: [PATCH 10/53] QmlDesigner.NavigatorView: Do not set a position for new items If items are dragged into the navigator we should not set the position to 0,0 expliticly, because this breaks layouts. Change-Id: I6e7cd130390ab68d13904d379a35dc4fa4337231 Reviewed-by: Tim Jenssen --- .../qmldesigner/components/navigator/navigatortreemodel.cpp | 4 ++-- src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index 91b2c657cd8..2adba6ea7e0 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -718,7 +718,7 @@ void NavigatorTreeModel::handleItemLibraryItemDrop(const QMimeData *mimeData, in if (foundTarget) { ItemLibraryEntry itemLibraryEntry = itemLibraryEntryFromData(mimeData->data("application/vnd.bauhaus.itemlibraryinfo")); - QmlItemNode newQmlItemNode = QmlItemNode::createQmlItemNode(m_view, itemLibraryEntry, QPointF(0., 0.), targetProperty); + QmlItemNode newQmlItemNode = QmlItemNode::createQmlItemNode(m_view, itemLibraryEntry, QPointF(), targetProperty); if (newQmlItemNode.isValid() && targetProperty.isNodeListProperty()) { QList newModelNodeList; @@ -739,7 +739,7 @@ void NavigatorTreeModel::handleItemLibraryImageDrop(const QMimeData *mimeData, i if (foundTarget) { QString imageFileName = QString::fromUtf8(mimeData->data("application/vnd.bauhaus.libraryresource")); - QmlItemNode newQmlItemNode = QmlItemNode::createQmlItemNodeFromImage(m_view, imageFileName, QPointF(0., 0.), targetProperty); + QmlItemNode newQmlItemNode = QmlItemNode::createQmlItemNodeFromImage(m_view, imageFileName, QPointF(), targetProperty); if (newQmlItemNode.isValid()) { QList newModelNodeList; diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp index 4242214f1f4..770f86b2a6f 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp @@ -117,8 +117,10 @@ QmlItemNode QmlItemNode::createQmlItemNode(AbstractView *view, const ItemLibrary QList propertyBindingList; if (itemLibraryEntry.qmlSource().isEmpty()) { QList > propertyPairList; - propertyPairList.append(qMakePair(PropertyName("x"), QVariant(qRound(position.x())))); - propertyPairList.append(qMakePair(PropertyName("y"), QVariant(qRound(position.y())))); + if (!position.isNull()) { + propertyPairList.append(qMakePair(PropertyName("x"), QVariant(qRound(position.x())))); + propertyPairList.append(qMakePair(PropertyName("y"), QVariant(qRound(position.y())))); + } foreach (const PropertyContainer &property, itemLibraryEntry.properties()) { if (property.type() == QStringLiteral("binding")) { From ebf45ac67702b5c8e835756089d28cce44fca427 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Tue, 19 Aug 2014 14:57:01 +0200 Subject: [PATCH 11/53] ios: Fix case in .pro files Task-number: QTCREATORBUG-12867 Change-Id: I4fcc1bdf74f1391f33fe99be16f8acbb9e049165 Reviewed-by: Fawzi Mohamed --- src/tools/3rdparty/iossim/iossim.pro | 2 +- src/tools/3rdparty/iossim_1_8_2/iossim_1_8_2.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/3rdparty/iossim/iossim.pro b/src/tools/3rdparty/iossim/iossim.pro index 25f185cb0f1..47534f00d74 100644 --- a/src/tools/3rdparty/iossim/iossim.pro +++ b/src/tools/3rdparty/iossim/iossim.pro @@ -42,7 +42,7 @@ include(../../../rpath.pri) OBJECTIVE_SOURCES += \ main.mm \ nsprintf.mm \ - nsstringexpandPath.mm \ + nsstringexpandpath.mm \ iphonesimulator.mm HEADERS += \ diff --git a/src/tools/3rdparty/iossim_1_8_2/iossim_1_8_2.pro b/src/tools/3rdparty/iossim_1_8_2/iossim_1_8_2.pro index 9e303074066..fc18227ca26 100644 --- a/src/tools/3rdparty/iossim_1_8_2/iossim_1_8_2.pro +++ b/src/tools/3rdparty/iossim_1_8_2/iossim_1_8_2.pro @@ -41,7 +41,7 @@ include(../../../rpath.pri) OBJECTIVE_SOURCES += \ main.mm \ nsprintf.mm \ - nsstringexpandPath.mm \ + nsstringexpandpath.mm \ iphonesimulator.mm HEADERS += \ From da4c7b2a81527cb92710ab93f9e27a30b9df4050 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 22 Aug 2014 09:39:38 +0200 Subject: [PATCH 12/53] QbsProjectManager: Don't leak the "Reading project" progress bar. If a qbs project gets closed (e.g. due to a session switch) while the project is being loaded, the corresponding QFuture does not get deleted and the progress bar will be around forever. This patch fixes that. Note: The project resolving by qbs was already correctly canceled; this is about the visual effect only. Change-Id: If00aed949505088cfdb87d08e26f3b62ccea5fd1 Reviewed-by: Joerg Bornemann --- src/plugins/qbsprojectmanager/qbsproject.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 622b88f492e..11d20a80e44 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -131,6 +131,11 @@ QbsProject::~QbsProject() { m_codeModelFuture.cancel(); delete m_qbsProjectParser; + if (m_qbsUpdateFutureInterface) { + m_qbsUpdateFutureInterface->reportCanceled(); + delete m_qbsUpdateFutureInterface; + m_qbsUpdateFutureInterface = 0; + } // Deleting the root node triggers a few things, make sure rootProjectNode // returns 0 already From 7aa6516942fc6f66317de7783dbfa1e4b0abdedf Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 22 Aug 2014 09:42:43 +0200 Subject: [PATCH 13/53] Update qbs submodule. To HEAD of the 1.3 branch. Change-Id: Idf631edd93cf7dd0ac005634d2fcd2999f148099 Reviewed-by: Joerg Bornemann --- src/shared/qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/qbs b/src/shared/qbs index 82c459ea14d..1358bf739a6 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 82c459ea14dcd8981e397038a30c501a6c3d7697 +Subproject commit 1358bf739a6580ccc1f4c113d5b1ba72784793a0 From 82bb8ce3ed1404f5f90b678d7ee4dfcda0fc15f3 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 21 Aug 2014 22:15:24 +0200 Subject: [PATCH 14/53] QmlDesigner: fix that we have too many updateActiveQtVersion() connections Change-Id: I3d9a9ba76d0da4def215541ccff02afc26e5e5f1 Reviewed-by: Thomas Hartmann --- .../qmldesigner/components/integration/designdocument.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp index f1a3a857b46..e2974a673d1 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp @@ -650,10 +650,9 @@ static inline ProjectExplorer::Kit *getActiveKit(DesignDocument *designDocument) if (!isFileInProject(designDocument, currentProject)) return 0; - designDocument->disconnect(designDocument, SLOT(updateActiveQtVersion())); - designDocument->connect(projectExplorer, SIGNAL(currentProjectChanged(ProjectExplorer::Project*)), designDocument, SLOT(updateActiveQtVersion())); + designDocument->connect(projectExplorer, SIGNAL(currentProjectChanged(ProjectExplorer::Project*)), designDocument, SLOT(updateActiveQtVersion()), Qt::UniqueConnection); - designDocument->connect(currentProject, SIGNAL(activeTargetChanged(ProjectExplorer::Target*)), designDocument, SLOT(updateActiveQtVersion())); + designDocument->connect(currentProject, SIGNAL(activeTargetChanged(ProjectExplorer::Target*)), designDocument, SLOT(updateActiveQtVersion()), Qt::UniqueConnection); ProjectExplorer::Target *target = currentProject->activeTarget(); @@ -661,7 +660,7 @@ static inline ProjectExplorer::Kit *getActiveKit(DesignDocument *designDocument) if (!target) return 0; - designDocument->connect(target, SIGNAL(kitChanged()), designDocument, SLOT(updateActiveQtVersion())); + designDocument->connect(target, SIGNAL(kitChanged()), designDocument, SLOT(updateActiveQtVersion()), Qt::UniqueConnection); return target->kit(); } From e0b518b832790b790b5fd34d8576daefcf33bf33 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 22 Aug 2014 12:25:11 +0200 Subject: [PATCH 15/53] OSX: Fix deployment of qml puppets They are no longer app bundles Change-Id: Ia2b9c62d478ae4ccacb20dc20eda44695d0fe960 Reviewed-by: Tim Jenssen --- dist/installer/mac/qmlpuppet_qt.conf | 4 ---- scripts/deployqtHelper_mac.sh | 14 ++++---------- 2 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 dist/installer/mac/qmlpuppet_qt.conf diff --git a/dist/installer/mac/qmlpuppet_qt.conf b/dist/installer/mac/qmlpuppet_qt.conf deleted file mode 100644 index 034fabe6f8a..00000000000 --- a/dist/installer/mac/qmlpuppet_qt.conf +++ /dev/null @@ -1,4 +0,0 @@ -[Paths] -Imports = ../../../Imports/qtquick1 -Qml2Imports = ../../../Imports/qtquick2 -Plugins = ../../../PlugIns diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index 3331e27a2e9..78188870b64 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -23,20 +23,14 @@ if [ -d "$5" ]; then cp -R "$5"/ "$imports2Dir"/ fi -qmlpuppetapp="$1/Contents/MacOS/qmlpuppet.app" +qmlpuppetapp="$1/Contents/MacOS/qmlpuppet" if [ -d "$qmlpuppetapp" ]; then - qmlpuppetArgument="-executable=$qmlpuppetapp/Contents/MacOS/qmlpuppet" - qmlpuppetResources="$1/Contents/MacOS/qmlpuppet.app/Contents/Resources" - test -d "$qmlpuppetResources" || mkdir -p "$qmlpuppetResources" - cp "$(dirname "${BASH_SOURCE[0]}")/../dist/installer/mac/qmlpuppet_qt.conf" "$qmlpuppetResources/qt.conf" || exit 1 + qmlpuppetArgument="-executable=$qmlpuppetapp" fi -qml2puppetapp="$1/Contents/MacOS/qml2puppet.app" +qml2puppetapp="$1/Contents/MacOS/qml2puppet" if [ -d "$qml2puppetapp" ]; then - qml2puppetArgument="-executable=$qml2puppetapp/Contents/MacOS/qml2puppet" - qml2puppetResources="$1/Contents/MacOS/qml2puppet.app/Contents/Resources" - test -d "$qml2puppetResources" || mkdir -p "$qml2puppetResources" - cp "$(dirname "${BASH_SOURCE[0]}")/../dist/installer/mac/qmlpuppet_qt.conf" "$qml2puppetResources/qt.conf" || exit 1 + qml2puppetArgument="-executable=$qml2puppetapp" fi macdeployqt "$1" \ From 6fc39f0c41c248be00c5673ae80d03d115bf3739 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 21 Aug 2014 17:25:27 +0200 Subject: [PATCH 16/53] Locator: Fix deadlock Updating the completion list is done in a separate thread, and for the all and current project filters that requires a slot to be synchronously executed on the main thread. Triggering the update first canceled a running update and waited for it to finish, before starting the next update. If the first update hadn't run its code on the main thread yet, it was never be able to, and never finished. The patch just removes the waitForFinished after the cancel. There is no reason to wait, since we retrieve all results only when we get the finished signal of a non-canceled update anyhow. Broke with 05c267673f43ecbb0ae4c44adc7d02a690435f8b when fixing QTCREATORBUG-12592 Task-number: QTCREATORBUG-12875 Change-Id: Iba9d46d469e6b2c7e894963d964c2eaca4bc4d93 Reviewed-by: Christian Kandeler --- src/plugins/coreplugin/locator/locatorwidget.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp index 93d02df0153..07e80e557f9 100644 --- a/src/plugins/coreplugin/locator/locatorwidget.cpp +++ b/src/plugins/coreplugin/locator/locatorwidget.cpp @@ -483,7 +483,6 @@ void LocatorWidget::updateCompletionList(const QString &text) // cancel the old future m_entriesWatcher->future().cancel(); - m_entriesWatcher->future().waitForFinished(); QFuture future = QtConcurrent::run(runSearch, filters, searchText); m_entriesWatcher->setFuture(future); From 72c60097c3957be617f2e1c9dc5897862b931eff Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 18 Aug 2014 13:55:44 +0200 Subject: [PATCH 17/53] Debugger: Rework matching of debugger item and target The general idea is to find an item that matches closely what is stored in the kit information, but also accept item based on toolchain matching as fallback with a lower priority. Change-Id: I41a00562fa4308eb834d853865c41873ef362bd8 Reviewed-by: Orgad Shaneh Reviewed-by: hjk --- .../debugger/debuggerkitinformation.cpp | 130 ++++++++++-------- 1 file changed, 69 insertions(+), 61 deletions(-) diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp index 2013a478c8d..0949118abf3 100644 --- a/src/plugins/debugger/debuggerkitinformation.cpp +++ b/src/plugins/debugger/debuggerkitinformation.cpp @@ -39,6 +39,7 @@ #include #include +#include using namespace ProjectExplorer; using namespace Utils; @@ -73,19 +74,7 @@ QVariant DebuggerKitInformation::defaultValue(Kit *k) const void DebuggerKitInformation::setup(Kit *k) { - // Get one of the available debugger matching the kit's toolchain. - const ToolChain *tc = ToolChainKitInformation::toolChain(k); - const Abi toolChainAbi = tc ? tc->targetAbi() : Abi::hostAbi(); - // This can be anything (Id, binary path, "auto") - const QVariant rawId = k->value(DebuggerKitInformation::id()); - - enum { - NotDetected, DetectedAutomatically, DetectedByFile, DetectedById - } detection = NotDetected; - DebuggerEngineType autoEngine = NoEngineType; - FileName fileName; - // With 3.0 we have: // {75ecf347-f221-44c3-b613-ea1d29929cd4} // Before we had: @@ -98,68 +87,87 @@ void DebuggerKitInformation::setup(Kit *k) // auto // 4 // + const QVariant rawId = k->value(DebuggerKitInformation::id()); - if (rawId.isNull()) { - // Initial setup of a kit - detection = NotDetected; - } else if (rawId.type() == QVariant::String) { - detection = DetectedById; - } else { - QMap map = rawId.toMap(); - QString binary = map.value(QLatin1String("Binary")).toString(); - if (binary == QLatin1String("auto")) { - detection = DetectedAutomatically; - autoEngine = DebuggerEngineType(map.value(QLatin1String("EngineType")).toInt()); - } else { - detection = DetectedByFile; - fileName = FileName::fromUserInput(binary); - } - } + const ToolChain *tc = ToolChainKitInformation::toolChain(k); + + // Get the best of the available debugger matching the kit's toolchain. + // The general idea is to find an item that exactly matches what + // is stored in the kit information, but also accept item based + // on toolchain matching as fallback with a lower priority. const DebuggerItem *bestItem = 0; DebuggerItem::MatchLevel bestLevel = DebuggerItem::DoesNotMatch; - foreach (const DebuggerItem &item, DebuggerItemManager::debuggers()) { - const DebuggerItem *goodItem = 0; - if (detection == DetectedById && item.id() == rawId) - goodItem = &item; - if (detection == DetectedByFile && item.command() == fileName) - goodItem = &item; - if (detection == DetectedAutomatically && item.engineType() == autoEngine) - goodItem = &item; - if (item.isAutoDetected()) - goodItem = &item; - if (goodItem) { - DebuggerItem::MatchLevel level = goodItem->matchTarget(toolChainAbi); - if (level > bestLevel) { - bestLevel = level; - bestItem = goodItem; + foreach (const DebuggerItem &item, DebuggerItemManager::debuggers()) { + DebuggerItem::MatchLevel level = DebuggerItem::DoesNotMatch; + + if (rawId.isNull()) { + // Initial setup of a kit. + if (tc) { + // Use item if target toolchain fits. + level = item.matchTarget(tc->targetAbi()); + } else { + // Use item if host toolchain fits, but only as fallback. + level = std::min(item.matchTarget(Abi::hostAbi()), DebuggerItem::MatchesSomewhat); + } + } else if (rawId.type() == QVariant::String) { + // New structure. + if (item.id() == rawId) { + // Detected by ID. + level = DebuggerItem::MatchesPerfectly; + } else { + // This item does not match by ID, and is an unlikely candidate. + // However, consider using it as fallback if the tool chain fits. + if (tc) + level = std::min(item.matchTarget(tc->targetAbi()), DebuggerItem::MatchesSomewhat); + } + } else { + // Old structure. + const QMap map = rawId.toMap(); + QString binary = map.value(QLatin1String("Binary")).toString(); + if (binary == QLatin1String("auto")) { + // This is close to the "new kit" case, except that we know + // an engine type. + DebuggerEngineType autoEngine = DebuggerEngineType(map.value(QLatin1String("EngineType")).toInt()); + if (item.engineType() == autoEngine) { + if (tc) { + // Use item if target toolchain fits. + level = item.matchTarget(tc->targetAbi()); + } else { + // Use item if host toolchain fits, but only as fallback. + level = std::min(item.matchTarget(Abi::hostAbi()), DebuggerItem::MatchesSomewhat); + } + } + } else { + // We have an executable path. + FileName fileName = FileName::fromUserInput(binary); + if (item.command() == fileName) { + // And it's is the path of this item. + if (tc) { + // Use item if target toolchain fits. + level = item.matchTarget(tc->targetAbi()); + } else { + // Use item if host toolchain fits, but only as fallback. + level = std::min(item.matchTarget(Abi::hostAbi()), DebuggerItem::MatchesSomewhat); + } + } else { + // This item does not match by filename, and is an unlikely candidate. + // However, consider using it as fallback if the tool chain fits. + if (tc) + level = std::min(item.matchTarget(tc->targetAbi()), DebuggerItem::MatchesSomewhat); + } } } - } - // If we have an existing debugger with matching id _and_ - // matching target ABI we are fine. - if (bestItem) { - k->setValue(DebuggerKitInformation::id(), bestItem->id()); - return; - } - - // We didn't find an existing debugger that matched by whatever - // data we found in the kit (i.e. no id, filename, "auto") - // (or what we found did not match ABI-wise) - // Let's try to pick one with matching ABI. - QVariant bestId; - bestLevel = DebuggerItem::DoesNotMatch; - foreach (const DebuggerItem &item, DebuggerItemManager::debuggers()) { - DebuggerItem::MatchLevel level = item.matchTarget(toolChainAbi); if (level > bestLevel) { bestLevel = level; - bestId = item.id(); + bestItem = &item; } } - k->setValue(DebuggerKitInformation::id(), bestId); + // Use the best id we found, or an invalid one. + k->setValue(DebuggerKitInformation::id(), bestItem ? bestItem->id() : QVariant()); } From 5b5a7d1deaa77aac0e3c3c3e89523ee9562bc4a6 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 24 Aug 2014 08:36:07 +0300 Subject: [PATCH 18/53] Debugger: Avoid duplication of SDK debuggers Task-number: QTCREATORBUG-12888 Change-Id: I732f1bfe44dc47d0c96570649f3bf8c0e3f40dda Reviewed-by: Tobias Hunger --- src/plugins/debugger/debuggeritemmanager.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index 05a6b428ea8..52c1453e378 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -378,18 +378,15 @@ void DebuggerItemManager::saveDebuggers() QVariant DebuggerItemManager::registerDebugger(const DebuggerItem &item) { - // Force addition when Id is set. - if (item.id().isValid()) - return addDebugger(item); - - // Otherwise, try re-using existing item first. + // Try re-using existing item first. foreach (const DebuggerItem &d, m_debuggers) { if (d.command() == item.command() && d.isAutoDetected() == item.isAutoDetected() && d.engineType() == item.engineType() && d.displayName() == item.displayName() - && d.abis() == item.abis()) + && d.abis() == item.abis()) { return d.id(); + } } // Nothing suitable. Create a new id and add the item. From fa69e5ea1e80225eaad95f5daecabc64f63eeb17 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 11 Aug 2014 23:41:30 +0300 Subject: [PATCH 19/53] Abi: Fix detection of mips64el Change-Id: I3821a8817bbb7e76f95f53d058c2f1599320bff7 Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/abi.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp index f8fb18ed76b..d4ca72033e7 100644 --- a/src/plugins/projectexplorer/abi.cpp +++ b/src/plugins/projectexplorer/abi.cpp @@ -471,7 +471,7 @@ Abi Abi::abiFromTargetTriplet(const QString &triple) width = 32; } else if (p.startsWith(QLatin1String("mips"))) { arch = Abi::MipsArchitecture; - width = p.endsWith(QLatin1String("64")) ? 64 : 32; + width = p.contains(QLatin1String("64")) ? 64 : 32; } else if (p == QLatin1String("x86_64") || p == QLatin1String("amd64")) { arch = Abi::X86Architecture; width = 64; @@ -1065,6 +1065,10 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiFromTargetTriplet_data() QTest::newRow("mips64-linux-octeon-gnu") << int(Abi::MipsArchitecture) << int(Abi::LinuxOS) << int(Abi::GenericLinuxFlavor) << int(Abi::ElfFormat) << 64; + + QTest::newRow("mips64el-linux-gnuabi") << int(Abi::MipsArchitecture) + << int(Abi::LinuxOS) << int(Abi::GenericLinuxFlavor) + << int(Abi::ElfFormat) << 64; } void ProjectExplorer::ProjectExplorerPlugin::testAbiFromTargetTriplet() From 153fe543a8faea34019a7af44aacaf8b447fac0b Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 25 Aug 2014 11:30:09 +0200 Subject: [PATCH 20/53] iOS: Fix determination of SDK with maximum version Change-Id: I6fc1f0eceeff4286936999986263cb034c1a7663 Reviewed-by: Fawzi Mohamed --- src/plugins/ios/iosprobe.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/ios/iosprobe.cpp b/src/plugins/ios/iosprobe.cpp index 8cea854e15b..898d35cfe97 100644 --- a/src/plugins/ios/iosprobe.cpp +++ b/src/plugins/ios/iosprobe.cpp @@ -248,7 +248,7 @@ void IosProbe::setupDefaultToolchains(const QString &devPath, const QString &xco continue; } if (sdkName.isEmpty()) { - if (compareVersions(maxVersion, versionStr) > 0) { + if (maxVersion.isEmpty() || compareVersions(maxVersion, versionStr) > 0) { maxVersion = versionStr; sdkPath = sdkDirInfo.canonicalFilePath(); sdkSettings = sdkInfo; From 440c40f53411054255f41f3efc96ec0a537e234c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 15 Aug 2014 16:16:10 +0200 Subject: [PATCH 21/53] don't declare defeat if only cumulative evaluation fails it is entirely plausible that the precise evaluation would succeed, while the cumulative would fail due to some serious inaccuracies introduced by it. such problems would be particularly hard to debug, as we suppress error messages from the cumulative parsing, so the user would get a "Giving up" message without any context. Change-Id: I826b3b1d838808464b551e8ee0d7375d239442a3 Reviewed-by: Gatis Paeglis Reviewed-by: Daniel Teske --- src/plugins/qmakeprojectmanager/qmakenodes.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index 949f4cec17e..5031c87edfd 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -1713,17 +1713,13 @@ void QmakeProFileNode::setupReader() QmakeProFileNode::EvalResult QmakeProFileNode::evaluate() { - EvalResult evalResult = EvalOk; if (ProFile *pro = m_readerExact->parsedProFile(m_projectFilePath)) { - if (!m_readerExact->accept(pro, QMakeEvaluator::LoadAll)) - evalResult = EvalPartial; - if (!m_readerCumulative->accept(pro, QMakeEvaluator::LoadPreFiles)) - evalResult = EvalFail; + bool exactOk = m_readerExact->accept(pro, QMakeEvaluator::LoadAll); + bool cumulOk = m_readerCumulative->accept(pro, QMakeEvaluator::LoadPreFiles); pro->deref(); - } else { - evalResult = EvalFail; + return exactOk ? EvalOk : cumulOk ? EvalPartial : EvalFail; } - return evalResult; + return EvalFail; } void QmakeProFileNode::asyncEvaluate(QFutureInterface &fi) From 2693e087683cc49196d13e57ccda17e477eb5b77 Mon Sep 17 00:00:00 2001 From: jkobus Date: Fri, 15 Aug 2014 08:44:22 +0200 Subject: [PATCH 22/53] Add an Open menu action to qt quick templates Task-number: QTCREATORBUG-11728 Change-Id: I7f3ad47a2fe4a247efefe57a0de5149c64ac2456 Reviewed-by: Eike Ziller --- share/qtcreator/templates/qml/qtquickcontrols_1_0/main.qml | 4 ++++ share/qtcreator/templates/qml/qtquickcontrols_1_1/main.qml | 4 ++++ .../qtcreator/templates/qtquick/qtquickcontrols_1_0/main.qml | 4 ++++ .../qtcreator/templates/qtquick/qtquickcontrols_1_1/main.qml | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/share/qtcreator/templates/qml/qtquickcontrols_1_0/main.qml b/share/qtcreator/templates/qml/qtquickcontrols_1_0/main.qml index f886b99fb9d..51f84b51061 100644 --- a/share/qtcreator/templates/qml/qtquickcontrols_1_0/main.qml +++ b/share/qtcreator/templates/qml/qtquickcontrols_1_0/main.qml @@ -10,6 +10,10 @@ ApplicationWindow { menuBar: MenuBar { Menu { title: qsTr("File") + MenuItem { + text: qsTr("&Open") + onTriggered: console.log("Open action triggered"); + } MenuItem { text: qsTr("Exit") onTriggered: Qt.quit(); diff --git a/share/qtcreator/templates/qml/qtquickcontrols_1_1/main.qml b/share/qtcreator/templates/qml/qtquickcontrols_1_1/main.qml index 74609d82c89..211da365f72 100644 --- a/share/qtcreator/templates/qml/qtquickcontrols_1_1/main.qml +++ b/share/qtcreator/templates/qml/qtquickcontrols_1_1/main.qml @@ -10,6 +10,10 @@ ApplicationWindow { menuBar: MenuBar { Menu { title: qsTr("File") + MenuItem { + text: qsTr("&Open") + onTriggered: console.log("Open action triggered"); + } MenuItem { text: qsTr("Exit") onTriggered: Qt.quit(); diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/main.qml b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/main.qml index 2e6b1dd3d0c..bece7d88e98 100644 --- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/main.qml +++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/main.qml @@ -10,6 +10,10 @@ ApplicationWindow { menuBar: MenuBar { Menu { title: qsTr("File") + MenuItem { + text: qsTr("&Open") + onTriggered: console.log("Open action triggered"); + } MenuItem { text: qsTr("Exit") onTriggered: Qt.quit(); diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/main.qml b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/main.qml index 4187749b5f0..cd9583c14d3 100644 --- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/main.qml +++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/main.qml @@ -10,6 +10,10 @@ ApplicationWindow { menuBar: MenuBar { Menu { title: qsTr("File") + MenuItem { + text: qsTr("&Open") + onTriggered: console.log("Open action triggered"); + } MenuItem { text: qsTr("Exit") onTriggered: Qt.quit(); From 3a766027777d5426fb020edbc887eeac76acff58 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 26 Aug 2014 10:35:08 +0300 Subject: [PATCH 23/53] Debugger: Fix soft assertion SOFT ASSERT: "!m_id.isValid()" in file .../debuggeritem.cpp, line 92 Introduced in 5b5a7d1deaa77aac0e3c3c3e89523ee9562bc4a6 Change-Id: I82416302402770d885f8eb96b6966294a5368cbe Reviewed-by: hjk --- src/plugins/debugger/debuggeritemmanager.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index 52c1453e378..517101ac13a 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -389,7 +389,10 @@ QVariant DebuggerItemManager::registerDebugger(const DebuggerItem &item) } } - // Nothing suitable. Create a new id and add the item. + // If item already has an id, add it. Otherwise, create a new id. + if (item.id().isValid()) + return addDebugger(item); + DebuggerItem di = item; di.createId(); return addDebugger(di); From 2e8509d8b2608af5cdcedda6c30e96bceab6586d Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Thu, 21 Aug 2014 18:03:23 +0200 Subject: [PATCH 24/53] Fix missing argument Change-Id: Id43d168859012ce9dcebb62e996cfdef7079aaaa Reviewed-by: Leena Miettinen Reviewed-by: Eike Ziller --- src/plugins/winrt/winrtdebugsupport.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/winrt/winrtdebugsupport.cpp b/src/plugins/winrt/winrtdebugsupport.cpp index bb6bd4a3731..ae6d3228143 100644 --- a/src/plugins/winrt/winrtdebugsupport.cpp +++ b/src/plugins/winrt/winrtdebugsupport.cpp @@ -84,7 +84,7 @@ RunControl *WinRtDebugSupport::createDebugRunControl(WinRtRunConfiguration *runC + QLatin1String("/winrtdebughelper.exe")); if (!debuggerHelper.isExecutable()) { *errorMessage = tr("The WinRT debugging helper is missing from your Qt Creator " - "installation. It was assumed to be located at").arg( + "installation. It was assumed to be located at %1").arg( debuggerHelper.absoluteFilePath()); return 0; } From 14fe8f07cdb3c6c2c48a1ca16c3417791184e623 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 25 Aug 2014 18:22:05 +0200 Subject: [PATCH 25/53] Squish: Update Creator's sources to v3.2.0 Change-Id: I224da43ad46acfce33fb62926df62c211164ed40 Reviewed-by: Christian Stenger --- tests/system/README | 2 +- .../testdata/projecttree_creator.tsv | 2304 ++++++++++------- 2 files changed, 1324 insertions(+), 982 deletions(-) diff --git a/tests/system/README b/tests/system/README index c220aa52677..d09f3239fdf 100644 --- a/tests/system/README +++ b/tests/system/README @@ -18,7 +18,7 @@ Fourth - you'll have to provide some additional repositories (and for the hookin These additional repositories are located inside ~/QtSDK/src or C:\QtSDK\src (depending on the OS you're on). You can also just provide them inside a different folder and specify the folder with the environment variable SYSTEST_SRCPATH. This folder must contain the following: - * a QtCreator repository (or source copy) of tag v3.1.0 named 'creator' including the submodule src/shared/qbs + * a QtCreator repository (or source copy) of tag v3.2.0 named 'creator' including the submodule src/shared/qbs * a subfolder called 'creator-test-data' * a speedcrunch 0.11 repository (or source copy) inside 'creator-test-data' named 'speedcrunch' * additional Squish versions for hooking into subprocesses inside different folders inside 'creator-test-data' following the information below diff --git a/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv b/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv index f7378d9a751..be1df8d9b07 100644 --- a/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv +++ b/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv @@ -53,6 +53,7 @@ "lldbbridge.py" "4" "misctypes.py" "4" "pdumper.py" "4" +"personaltypes.py" "4" "qttypes.py" "4" "stdtypes.py" "4" "designer" "3" @@ -134,6 +135,8 @@ "informationchangedcommand.h" "6" "pixmapchangedcommand.cpp" "6" "pixmapchangedcommand.h" "6" +"puppetalivecommand.cpp" "6" +"puppetalivecommand.h" "6" "removeinstancescommand.cpp" "6" "removeinstancescommand.h" "6" "removepropertiescommand.cpp" "6" @@ -170,6 +173,9 @@ "propertyvaluecontainer.h" "6" "reparentcontainer.cpp" "6" "reparentcontainer.h" "6" +"sharedmemory.h" "6" +"sharedmemory_qt.cpp" "6" +"sharedmemory_unix.cpp" "6" "html" "5" "welcome.html" "6" "images" "5" @@ -186,6 +192,8 @@ "nodeinstanceglobal.h" "6" "nodeinstanceserverinterface.cpp" "6" "nodeinstanceserverinterface.h" "6" +"mockfiles" "5" +"Window.qml" "6" "qml2puppet" "5" "instances" "6" "anchorchangesnodeinstance.cpp" "7" @@ -200,8 +208,6 @@ "dummycontextobject.h" "7" "dummynodeinstance.cpp" "7" "dummynodeinstance.h" "7" -"graphicalnodeinstance.cpp" "7" -"graphicalnodeinstance.h" "7" "instances.pri" "7" "layoutnodeinstance.cpp" "7" "layoutnodeinstance.h" "7" @@ -235,11 +241,9 @@ "qt5testnodeinstanceserver.h" "7" "quickitemnodeinstance.cpp" "7" "quickitemnodeinstance.h" "7" -"quickwindownodeinstance.cpp" "7" -"quickwindownodeinstance.h" "7" "servernodeinstance.cpp" "7" "servernodeinstance.h" "7" -"Info.plist.in" "6" +"Info.plist" "6" "qml2puppet.pri" "6" "qml2puppet.pro" "6" "qml2puppetmain.cpp" "6" @@ -290,7 +294,7 @@ "qt4rendernodeinstanceserver.h" "7" "servernodeinstance.cpp" "7" "servernodeinstance.h" "7" -"Info.plist.in" "6" +"Info.plist" "6" "qmlpuppet.pri" "6" "qmlpuppet.pro" "6" "qmlpuppetmain.cpp" "6" @@ -327,6 +331,11 @@ "qtmultimediakit.qmltypes" "4" "qtwebkit.qmltypes" "4" "qmldesigner" "3" +"common" "4" +"DesignerScrollViewStyle.qml" "5" +"itemLibraryQmlSources" "4" +"ItemDelegate.qml" "5" +"ItemsView.qml" "5" "propertyeditor/HelperWidgets" "4" "qmldir" "5" "propertyEditorQmlSources" "4" @@ -411,6 +420,7 @@ "StandardTextSection.qml" "6" "Tab.qml" "6" "TabView.qml" "6" +"ToolTipArea.qml" "6" "UrlChooser.qml" "6" "PropertyTemplates" "5" "BooleanEditorTemplate.template" "6" @@ -449,6 +459,13 @@ "TextInputSection.qml" "6" "TextInputSpecifics.qml" "6" "TextSpecifics.qml" "6" +"statesEditorQmlSources" "4" +"images" "5" +"darkclose.png" "6" +"plus.png" "6" +"DesignerTextFieldStyle.qml" "5" +"StatesDelegate.qml" "5" +"StatesList.qml" "5" "qmlicons" "3" "Qt/16x16" "4" "BorderImage.png" "5" @@ -521,31 +538,6 @@ "inkpot.xml" "4" "intellij.xml" "4" "templates" "3" -"html5app" "4" -"html" "5" -"index.html" "6" -"html5applicationviewer" "5" -"touchnavigation" "6" -"navigationcontroller.cpp" "7" -"navigationcontroller.h" "7" -"touchnavigation.pri" "7" -"webnavigation.cpp" "7" -"webnavigation.h" "7" -"webtouchevent.cpp" "7" -"webtouchevent.h" "7" -"webtouchnavigation.cpp" "7" -"webtouchnavigation.h" "7" -"webtouchphysics.cpp" "7" -"webtouchphysics.h" "7" -"webtouchphysicsinterface.cpp" "7" -"webtouchphysicsinterface.h" "7" -"webtouchscroller.cpp" "7" -"webtouchscroller.h" "7" -"html5applicationviewer.cpp" "6" -"html5applicationviewer.h" "6" -"html5applicationviewer.pri" "6" -"app.pro" "5" -"main.cpp" "5" "qml" "4" "qtquick_1_1" "5" "main.qml" "6" @@ -817,79 +809,92 @@ "vi.xml" "4" "vi_mac.xml" "4" "QML" "2" -"qmldesigner/propertyEditorQmlSources" "3" -"HelperWidgets" "4" -"AligmentHorizontalButtons.qml" "5" -"AligmentVerticalButtons.qml" "5" -"AnchorButtons.qml" "5" -"BoolButtonRowButton.qml" "5" -"Button.qml" "5" -"ButtonRow.qml" "5" -"ButtonRow2.qml" "5" -"ButtonRowButton.qml" "5" -"CheckBox.qml" "5" -"ColorButton.qml" "5" -"ColorCheckButton.qml" "5" -"ColorEditor.qml" "5" -"ColorLogic.qml" "5" -"ComboBox.qml" "5" -"CustomCheckBoxStyle.qml" "5" -"CustomComboBoxStyle.qml" "5" -"CustomSpinBoxStyle.qml" "5" -"ExpandingSpacer.qml" "5" -"ExtendedFunctionButton.qml" "5" -"FlickableSection.qml" "5" -"FontComboBox.qml" "5" -"FontSection.qml" "5" -"FontStyleButtons.qml" "5" -"GradientLine.qml" "5" -"GroupBox.qml" "5" -"HueSlider.qml" "5" -"IconLabel.qml" "5" -"Label.qml" "5" -"LineEdit.qml" "5" -"OriginControl.qml" "5" -"RoundedPanel.qml" "5" -"ScrollView.qml" "5" -"SecondColumnLayout.qml" "5" -"Section.qml" "5" -"SectionLayout.qml" "5" -"SliderSpinBox.qml" "5" -"SpinBox.qml" "5" -"StandardTextSection.qml" "5" -"Tab.qml" "5" -"TabView.qml" "5" -"UrlChooser.qml" "5" -"PropertyTemplates" "4" -"TemplateTypes.qml" "5" -"QtQuick" "4" -"Window" "5" -"WindowSpecifics.qml" "6" -"AdvancedSection.qml" "5" -"AnchorRow.qml" "5" -"BorderImageSpecifics.qml" "5" -"ColumnSpecifics.qml" "5" -"emptyPane.qml" "5" -"FlickableSpecifics.qml" "5" -"FlipableSpecifics.qml" "5" -"FlowSpecifics.qml" "5" -"GeometrySection.qml" "5" -"GridSpecifics.qml" "5" -"GridViewSpecifics.qml" "5" -"ImageSpecifics.qml" "5" -"ItemPane.qml" "5" -"LayoutSection.qml" "5" -"ListViewSpecifics.qml" "5" -"MouseAreaSpecifics.qml" "5" -"PathViewSpecifics.qml" "5" -"QtObjectPane.qml" "5" -"RectangleSpecifics.qml" "5" -"RowSpecifics.qml" "5" -"TargetComboBox.qml" "5" -"TextEditSpecifics.qml" "5" -"TextInputSection.qml" "5" -"TextInputSpecifics.qml" "5" -"TextSpecifics.qml" "5" +"qml/qmlpuppet/mockfiles" "3" +"Window.qml" "4" +"qmldesigner" "3" +"common" "4" +"DesignerScrollViewStyle.qml" "5" +"itemLibraryQmlSources" "4" +"ItemDelegate.qml" "5" +"ItemsView.qml" "5" +"propertyEditorQmlSources" "4" +"HelperWidgets" "5" +"AligmentHorizontalButtons.qml" "6" +"AligmentVerticalButtons.qml" "6" +"AnchorButtons.qml" "6" +"BoolButtonRowButton.qml" "6" +"Button.qml" "6" +"ButtonRow.qml" "6" +"ButtonRow2.qml" "6" +"ButtonRowButton.qml" "6" +"CheckBox.qml" "6" +"ColorButton.qml" "6" +"ColorCheckButton.qml" "6" +"ColorEditor.qml" "6" +"ColorLogic.qml" "6" +"ComboBox.qml" "6" +"CustomCheckBoxStyle.qml" "6" +"CustomComboBoxStyle.qml" "6" +"CustomSpinBoxStyle.qml" "6" +"ExpandingSpacer.qml" "6" +"ExtendedFunctionButton.qml" "6" +"FlickableSection.qml" "6" +"FontComboBox.qml" "6" +"FontSection.qml" "6" +"FontStyleButtons.qml" "6" +"GradientLine.qml" "6" +"GroupBox.qml" "6" +"HueSlider.qml" "6" +"IconLabel.qml" "6" +"Label.qml" "6" +"LineEdit.qml" "6" +"OriginControl.qml" "6" +"RoundedPanel.qml" "6" +"ScrollView.qml" "6" +"SecondColumnLayout.qml" "6" +"Section.qml" "6" +"SectionLayout.qml" "6" +"SliderSpinBox.qml" "6" +"SpinBox.qml" "6" +"StandardTextSection.qml" "6" +"Tab.qml" "6" +"TabView.qml" "6" +"ToolTipArea.qml" "6" +"UrlChooser.qml" "6" +"PropertyTemplates" "5" +"TemplateTypes.qml" "6" +"QtQuick" "5" +"Window" "6" +"WindowSpecifics.qml" "7" +"AdvancedSection.qml" "6" +"AnchorRow.qml" "6" +"BorderImageSpecifics.qml" "6" +"ColumnSpecifics.qml" "6" +"emptyPane.qml" "6" +"FlickableSpecifics.qml" "6" +"FlipableSpecifics.qml" "6" +"FlowSpecifics.qml" "6" +"GeometrySection.qml" "6" +"GridSpecifics.qml" "6" +"GridViewSpecifics.qml" "6" +"ImageSpecifics.qml" "6" +"ItemPane.qml" "6" +"LayoutSection.qml" "6" +"ListViewSpecifics.qml" "6" +"MouseAreaSpecifics.qml" "6" +"PathViewSpecifics.qml" "6" +"QtObjectPane.qml" "6" +"RectangleSpecifics.qml" "6" +"RowSpecifics.qml" "6" +"TargetComboBox.qml" "6" +"TextEditSpecifics.qml" "6" +"TextInputSection.qml" "6" +"TextInputSpecifics.qml" "6" +"TextSpecifics.qml" "6" +"statesEditorQmlSources" "4" +"DesignerTextFieldStyle.qml" "5" +"StatesDelegate.qml" "5" +"StatesList.qml" "5" "templates" "3" "qml" "4" "qtquick_1_1" "5" @@ -971,6 +976,7 @@ "lldbbridge.py" "4" "misctypes.py" "4" "pdumper.py" "4" +"personaltypes.py" "4" "qttypes.py" "4" "stdtypes.py" "4" "designer" "3" @@ -1052,6 +1058,8 @@ "informationchangedcommand.h" "6" "pixmapchangedcommand.cpp" "6" "pixmapchangedcommand.h" "6" +"puppetalivecommand.cpp" "6" +"puppetalivecommand.h" "6" "removeinstancescommand.cpp" "6" "removeinstancescommand.h" "6" "removepropertiescommand.cpp" "6" @@ -1088,6 +1096,9 @@ "propertyvaluecontainer.h" "6" "reparentcontainer.cpp" "6" "reparentcontainer.h" "6" +"sharedmemory.h" "6" +"sharedmemory_qt.cpp" "6" +"sharedmemory_unix.cpp" "6" "html" "5" "welcome.html" "6" "images" "5" @@ -1118,8 +1129,6 @@ "dummycontextobject.h" "7" "dummynodeinstance.cpp" "7" "dummynodeinstance.h" "7" -"graphicalnodeinstance.cpp" "7" -"graphicalnodeinstance.h" "7" "instances.pri" "7" "layoutnodeinstance.cpp" "7" "layoutnodeinstance.h" "7" @@ -1153,11 +1162,9 @@ "qt5testnodeinstanceserver.h" "7" "quickitemnodeinstance.cpp" "7" "quickitemnodeinstance.h" "7" -"quickwindownodeinstance.cpp" "7" -"quickwindownodeinstance.h" "7" "servernodeinstance.cpp" "7" "servernodeinstance.h" "7" -"Info.plist.in" "6" +"Info.plist" "6" "qml2puppet.pri" "6" "qml2puppet.pro" "6" "qml2puppetmain.cpp" "6" @@ -1208,7 +1215,7 @@ "qt4rendernodeinstanceserver.h" "7" "servernodeinstance.cpp" "7" "servernodeinstance.h" "7" -"Info.plist.in" "6" +"Info.plist" "6" "qmlpuppet.pri" "6" "qmlpuppet.pro" "6" "qmlpuppetmain.cpp" "6" @@ -1298,6 +1305,9 @@ "UrlEditorTemplate.template" "6" "QtQuick" "5" "project.qmlproject" "6" +"statesEditorQmlSources/images" "4" +"darkclose.png" "5" +"plus.png" "5" "qmlicons" "3" "Qt/16x16" "4" "BorderImage.png" "5" @@ -1370,31 +1380,6 @@ "inkpot.xml" "4" "intellij.xml" "4" "templates" "3" -"html5app" "4" -"html" "5" -"index.html" "6" -"html5applicationviewer" "5" -"touchnavigation" "6" -"navigationcontroller.cpp" "7" -"navigationcontroller.h" "7" -"touchnavigation.pri" "7" -"webnavigation.cpp" "7" -"webnavigation.h" "7" -"webtouchevent.cpp" "7" -"webtouchevent.h" "7" -"webtouchnavigation.cpp" "7" -"webtouchnavigation.h" "7" -"webtouchphysics.cpp" "7" -"webtouchphysics.h" "7" -"webtouchphysicsinterface.cpp" "7" -"webtouchphysicsinterface.h" "7" -"webtouchscroller.cpp" "7" -"webtouchscroller.h" "7" -"html5applicationviewer.cpp" "6" -"html5applicationviewer.h" "6" -"html5applicationviewer.pri" "6" -"app.pro" "5" -"main.cpp" "5" "qml" "4" "qtquick_1_1" "5" "main.qmlproject" "6" @@ -1665,6 +1650,514 @@ "Info.plist.in" "3" "qtcreator.icns" "3" "qtcreator.rc" "3" +"app" "1" +"app.pro" "2" +"config" "2" +"config.pro" "3" +"app" "3" +"app.pri" "4" +"library_dirname" "3" +"library_dirname.pri" "4" +"logging" "3" +"logging.pri" "4" +"Headers" "4" +"coloredoutput.h" "5" +"consolelogger.h" "5" +"Sources" "4" +"coloredoutput.cpp" "5" +"consolelogger.cpp" "5" +"qbs_version" "3" +"qbs_version.pri" "4" +"use_corelib" "3" +"use_corelib.pri" "4" +"Headers" "3" +"qbssettings.h" "5" +"configcommand.h" "4" +"configcommandexecutor.h" "4" +"configcommandlineparser.h" "4" +"Sources" "3" +"qbssettings.cpp" "5" +"configcommandexecutor.cpp" "4" +"configcommandlineparser.cpp" "4" +"configmain.cpp" "4" +"config-ui" "2" +"config-ui.pro" "3" +"app" "3" +"app.pri" "4" +"library_dirname" "3" +"library_dirname.pri" "4" +"logging" "3" +"logging.pri" "4" +"Headers" "4" +"coloredoutput.h" "5" +"consolelogger.h" "5" +"Sources" "4" +"coloredoutput.cpp" "5" +"consolelogger.cpp" "5" +"qbs_version" "3" +"qbs_version.pri" "4" +"use_corelib" "3" +"use_corelib.pri" "4" +"Headers" "3" +"qbssettings.h" "5" +"commandlineparser.h" "4" +"mainwindow.h" "4" +"settingsmodel.h" "4" +"Sources" "3" +"qbssettings.cpp" "5" +"commandlineparser.cpp" "4" +"main.cpp" "4" +"mainwindow.cpp" "4" +"settingsmodel.cpp" "4" +"Forms" "3" +"mainwindow.ui" "4" +"Other files" "3" +"Info.plist" "4" +"qbs" "2" +"qbs.pro" "3" +"app" "3" +"app.pri" "4" +"library_dirname" "3" +"library_dirname.pri" "4" +"logging" "3" +"logging.pri" "4" +"Headers" "4" +"coloredoutput.h" "5" +"consolelogger.h" "5" +"Sources" "4" +"coloredoutput.cpp" "5" +"consolelogger.cpp" "5" +"parser" "3" +"parser.pri" "4" +"Headers" "4" +"command.h" "5" +"commandlineoption.h" "5" +"commandlineoptionpool.h" "5" +"commandlineparser.h" "5" +"commandpool.h" "5" +"commandtype.h" "5" +"Sources" "4" +"command.cpp" "5" +"commandlineoption.cpp" "5" +"commandlineoptionpool.cpp" "5" +"commandlineparser.cpp" "5" +"commandpool.cpp" "5" +"qbs_version" "3" +"qbs_version.pri" "4" +"use_corelib" "3" +"use_corelib.pri" "4" +"Headers" "3" +"application.h" "4" +"commandlinefrontend.h" "4" +"consoleprogressobserver.h" "4" +"ctrlchandler.h" "4" +"qbstool.h" "4" +"status.h" "4" +"Sources" "3" +"application.cpp" "4" +"commandlinefrontend.cpp" "4" +"consoleprogressobserver.cpp" "4" +"ctrlchandler.cpp" "4" +"main.cpp" "4" +"qbstool.cpp" "4" +"status.cpp" "4" +"qbs-qmltypes" "2" +"qbs-qmltypes.pro" "3" +"app" "3" +"app.pri" "4" +"library_dirname" "3" +"library_dirname.pri" "4" +"logging" "3" +"logging.pri" "4" +"Headers" "4" +"coloredoutput.h" "5" +"consolelogger.h" "5" +"Sources" "4" +"coloredoutput.cpp" "5" +"consolelogger.cpp" "5" +"qbs_version" "3" +"qbs_version.pri" "4" +"use_corelib" "3" +"use_corelib.pri" "4" +"Sources" "3" +"main.cpp" "4" +"qbs-setup-qt" "2" +"qbs-setup-qt.pro" "3" +"app" "3" +"app.pri" "4" +"library_dirname" "3" +"library_dirname.pri" "4" +"logging" "3" +"logging.pri" "4" +"Headers" "4" +"coloredoutput.h" "5" +"consolelogger.h" "5" +"Sources" "4" +"coloredoutput.cpp" "5" +"consolelogger.cpp" "5" +"qbs_version" "3" +"qbs_version.pri" "4" +"use_corelib" "3" +"use_corelib.pri" "4" +"use_qtprofilesetup" "3" +"use_qtprofilesetup.pri" "4" +"Headers" "3" +"commandlineparser.h" "4" +"setupqt.h" "4" +"Sources" "3" +"commandlineparser.cpp" "4" +"main.cpp" "4" +"setupqt.cpp" "4" +"qbs-setup-toolchains" "2" +"qbs-setup-toolchains.pro" "3" +"app" "3" +"app.pri" "4" +"library_dirname" "3" +"library_dirname.pri" "4" +"logging" "3" +"logging.pri" "4" +"Headers" "4" +"coloredoutput.h" "5" +"consolelogger.h" "5" +"Sources" "4" +"coloredoutput.cpp" "5" +"consolelogger.cpp" "5" +"qbs_version" "3" +"qbs_version.pri" "4" +"use_corelib" "3" +"use_corelib.pri" "4" +"Headers" "3" +"commandlineparser.h" "4" +"msvcinfo.h" "4" +"msvcprobe.h" "4" +"probe.h" "4" +"vsenvironmentdetector.h" "4" +"xcodeprobe.h" "4" +"Sources" "3" +"commandlineparser.cpp" "4" +"main.cpp" "4" +"msvcprobe.cpp" "4" +"probe.cpp" "4" +"vsenvironmentdetector.cpp" "4" +"xcodeprobe.cpp" "4" +"corelib" "1" +"corelib.pro" "2" +"api" "2" +"api.pri" "3" +"Headers" "3" +"changeset.h" "4" +"internaljobs.h" "4" +"jobs.h" "4" +"languageinfo.h" "4" +"project.h" "4" +"project_p.h" "4" +"projectdata.h" "4" +"projectdata_p.h" "4" +"projectfileupdater.h" "4" +"propertymap_p.h" "4" +"qmljsrewriter.h" "4" +"runenvironment.h" "4" +"Sources" "3" +"changeset.cpp" "4" +"internaljobs.cpp" "4" +"jobs.cpp" "4" +"languageinfo.cpp" "4" +"project.cpp" "4" +"projectdata.cpp" "4" +"projectfileupdater.cpp" "4" +"qmljsrewriter.cpp" "4" +"runenvironment.cpp" "4" +"buildgraph" "2" +"buildgraph.pri" "3" +"Headers" "3" +"abstractcommandexecutor.h" "4" +"artifact.h" "4" +"artifactcleaner.h" "4" +"artifactset.h" "4" +"artifactvisitor.h" "4" +"buildgraph.h" "4" +"buildgraphloader.h" "4" +"buildgraphnode.h" "4" +"buildgraphvisitor.h" "4" +"command.h" "4" +"cycledetector.h" "4" +"depscanner.h" "4" +"emptydirectoriesremover.h" "4" +"executor.h" "4" +"executorjob.h" "4" +"filedependency.h" "4" +"forward_decls.h" "4" +"inputartifactscanner.h" "4" +"jscommandexecutor.h" "4" +"nodeset.h" "4" +"processcommandexecutor.h" "4" +"productbuilddata.h" "4" +"productinstaller.h" "4" +"projectbuilddata.h" "4" +"qtmocscanner.h" "4" +"rescuableartifactdata.h" "4" +"rulegraph.h" "4" +"rulenode.h" "4" +"rulesapplicator.h" "4" +"rulesevaluationcontext.h" "4" +"scanresultcache.h" "4" +"timestampsupdater.h" "4" +"transformer.h" "4" +"tst_buildgraph.h" "4" +"Sources" "3" +"abstractcommandexecutor.cpp" "4" +"artifact.cpp" "4" +"artifactcleaner.cpp" "4" +"artifactset.cpp" "4" +"artifactvisitor.cpp" "4" +"buildgraph.cpp" "4" +"buildgraphloader.cpp" "4" +"buildgraphnode.cpp" "4" +"command.cpp" "4" +"cycledetector.cpp" "4" +"depscanner.cpp" "4" +"emptydirectoriesremover.cpp" "4" +"executor.cpp" "4" +"executorjob.cpp" "4" +"filedependency.cpp" "4" +"inputartifactscanner.cpp" "4" +"jscommandexecutor.cpp" "4" +"nodeset.cpp" "4" +"processcommandexecutor.cpp" "4" +"productbuilddata.cpp" "4" +"productinstaller.cpp" "4" +"projectbuilddata.cpp" "4" +"qtmocscanner.cpp" "4" +"rescuableartifactdata.cpp" "4" +"rulegraph.cpp" "4" +"rulenode.cpp" "4" +"rulesapplicator.cpp" "4" +"rulesevaluationcontext.cpp" "4" +"scanresultcache.cpp" "4" +"timestampsupdater.cpp" "4" +"transformer.cpp" "4" +"tst_buildgraph.cpp" "4" +"jsextensions" "2" +"jsextensions.pri" "3" +"Headers" "3" +"domxml.h" "4" +"file.h" "4" +"jsextensions.h" "4" +"moduleproperties.h" "4" +"process.h" "4" +"propertylist.h" "4" +"textfile.h" "4" +"Sources" "3" +"domxml.cpp" "4" +"file.cpp" "4" +"jsextensions.cpp" "4" +"moduleproperties.cpp" "4" +"process.cpp" "4" +"propertylist.mm" "4" +"textfile.cpp" "4" +"language" "2" +"language.pri" "3" +"Headers" "3" +"artifactproperties.h" "4" +"asttools.h" "4" +"builtindeclarations.h" "4" +"builtinvalue.h" "4" +"evaluationdata.h" "4" +"evaluator.h" "4" +"evaluatorscriptclass.h" "4" +"filecontext.h" "4" +"filecontextbase.h" "4" +"filetags.h" "4" +"forward_decls.h" "4" +"functiondeclaration.h" "4" +"identifiersearch.h" "4" +"item.h" "4" +"itemdeclaration.h" "4" +"itemobserver.h" "4" +"itempool.h" "4" +"itemreader.h" "4" +"itemreaderastvisitor.h" "4" +"jsimports.h" "4" +"language.h" "4" +"loader.h" "4" +"moduleloader.h" "4" +"preparescriptobserver.h" "4" +"projectresolver.h" "4" +"property.h" "4" +"propertydeclaration.h" "4" +"propertymapinternal.h" "4" +"resolvedfilecontext.h" "4" +"scriptengine.h" "4" +"scriptpropertyobserver.h" "4" +"tst_language.h" "4" +"value.h" "4" +"Sources" "3" +"artifactproperties.cpp" "4" +"asttools.cpp" "4" +"builtindeclarations.cpp" "4" +"builtinvalue.cpp" "4" +"evaluator.cpp" "4" +"evaluatorscriptclass.cpp" "4" +"filecontext.cpp" "4" +"filecontextbase.cpp" "4" +"filetags.cpp" "4" +"identifiersearch.cpp" "4" +"item.cpp" "4" +"itemdeclaration.cpp" "4" +"itempool.cpp" "4" +"itemreader.cpp" "4" +"itemreaderastvisitor.cpp" "4" +"language.cpp" "4" +"loader.cpp" "4" +"moduleloader.cpp" "4" +"preparescriptobserver.cpp" "4" +"projectresolver.cpp" "4" +"propertydeclaration.cpp" "4" +"propertymapinternal.cpp" "4" +"resolvedfilecontext.cpp" "4" +"scriptengine.cpp" "4" +"tst_language.cpp" "4" +"value.cpp" "4" +"Other files" "3" +"testdata" "4" +"aboutdialog.cpp" "5" +"Banana" "5" +"baseproperty.qbs" "5" +"baseproperty_base.qbs" "5" +"buildconfigstringlistsyntax.qbs" "5" +"builtinFunctionInSearchPathsProperty.qbs" "5" +"canonicalArchitecture.qbs" "5" +"conditionaldepends.qbs" "5" +"conditionaldepends_base.qbs" "5" +"drawline.asm" "5" +"environmentvariable.qbs" "5" +"exports.qbs" "5" +"exports_product.qbs" "5" +"filecontextproperties.qbs" "5" +"filetags.qbs" "5" +"getNativeSetting.qbs" "5" +"groupconditions.qbs" "5" +"groupname.qbs" "5" +"homeDirectory.qbs" "5" +"idusage.qbs" "5" +"idusagebase.qbs" "5" +"invalidBindingInDisabledItem.qbs" "5" +"jsextensions.js" "5" +"jsimportsinmultiplescopes.js" "5" +"jsimportsinmultiplescopes.qbs" "5" +"main.cpp" "5" +"moduleproperties.qbs" "5" +"modules.qbs" "5" +"modulescope.qbs" "5" +"modulescope_base.qbs" "5" +"narf" "5" +"narf.zort" "5" +"nativesettings.ini" "5" +"outerInGroup.qbs" "5" +"pathproperties.qbs" "5" +"productconditions.qbs" "5" +"productdirectories.qbs" "5" +"profilevaluesandoverriddenvalues.qbs" "5" +"propertiesblocks.qbs" "5" +"propertiesblocks_base.qbs" "5" +"zort" "5" +"library" "2" +"library.pri" "3" +"library_dirname" "2" +"library_dirname.pri" "3" +"logging" "2" +"logging.pri" "3" +"Headers" "3" +"ilogsink.h" "4" +"logger.h" "4" +"translator.h" "4" +"Sources" "3" +"ilogsink.cpp" "4" +"logger.cpp" "4" +"parser" "2" +"parser.pri" "3" +"Headers" "3" +"qmlerror.h" "4" +"qmljsast_p.h" "4" +"qmljsastfwd_p.h" "4" +"qmljsastvisitor_p.h" "4" +"qmljsengine_p.h" "4" +"qmljsglobal_p.h" "4" +"qmljsgrammar_p.h" "4" +"qmljskeywords_p.h" "4" +"qmljslexer_p.h" "4" +"qmljsmemorypool_p.h" "4" +"qmljsparser_p.h" "4" +"Sources" "3" +"qmlerror.cpp" "4" +"qmljsast.cpp" "4" +"qmljsastvisitor.cpp" "4" +"qmljsengine_p.cpp" "4" +"qmljsgrammar.cpp" "4" +"qmljslexer.cpp" "4" +"qmljsparser.cpp" "4" +"qbs_version" "2" +"qbs_version.pri" "3" +"tools" "2" +"tools.pri" "3" +"Headers" "3" +"buildgraphlocker.h" "4" +"buildoptions.h" "4" +"cleanoptions.h" "4" +"codelocation.h" "4" +"error.h" "4" +"fileinfo.h" "4" +"filetime.h" "4" +"hostosinfo.h" "4" +"id.h" "4" +"installoptions.h" "4" +"persistence.h" "4" +"persistentobject.h" "4" +"preferences.h" "4" +"processresult.h" "4" +"processresult_p.h" "4" +"profile.h" "4" +"progressobserver.h" "4" +"propertyfinder.h" "4" +"qbs_export.h" "4" +"qbsassert.h" "4" +"qttools.h" "4" +"scannerpluginmanager.h" "4" +"scripttools.h" "4" +"settings.h" "4" +"setupprojectparameters.h" "4" +"shellutils.h" "4" +"tst_tools.h" "4" +"version.h" "4" +"weakpointer.h" "4" +"Sources" "3" +"buildgraphlocker.cpp" "4" +"buildoptions.cpp" "4" +"cleanoptions.cpp" "4" +"codelocation.cpp" "4" +"error.cpp" "4" +"fileinfo.cpp" "4" +"filetime_unix.cpp" "4" +"filetime_win.cpp" "4" +"id.cpp" "4" +"installoptions.cpp" "4" +"persistence.cpp" "4" +"preferences.cpp" "4" +"processresult.cpp" "4" +"profile.cpp" "4" +"progressobserver.cpp" "4" +"propertyfinder.cpp" "4" +"qbsassert.cpp" "4" +"qttools.cpp" "4" +"scannerpluginmanager.cpp" "4" +"scripttools.cpp" "4" +"settings.cpp" "4" +"setupprojectparameters.cpp" "4" +"shellutils.cpp" "4" +"tst_tools.cpp" "4" +"version.cpp" "4" +"Headers" "2" +"qbs.h" "3" "libs" "1" "libs.pro" "2" "aggregation" "2" @@ -1691,320 +2184,6 @@ "aggregation_dependencies.pri" "3" "cdb_detect" "2" "cdb_detect.pri" "3" -"corelib" "2" -"corelib.pro" "3" -"api" "3" -"api.pri" "4" -"Headers" "4" -"changeset.h" "5" -"internaljobs.h" "5" -"jobs.h" "5" -"languageinfo.h" "5" -"project.h" "5" -"projectdata.h" "5" -"projectdata_p.h" "5" -"projectfileupdater.h" "5" -"propertymap_p.h" "5" -"qmljsrewriter.h" "5" -"runenvironment.h" "5" -"Sources" "4" -"changeset.cpp" "5" -"internaljobs.cpp" "5" -"jobs.cpp" "5" -"languageinfo.cpp" "5" -"project.cpp" "5" -"projectdata.cpp" "5" -"projectfileupdater.cpp" "5" -"qmljsrewriter.cpp" "5" -"runenvironment.cpp" "5" -"buildgraph" "3" -"buildgraph.pri" "4" -"Headers" "4" -"abstractcommandexecutor.h" "5" -"artifact.h" "5" -"artifactcleaner.h" "5" -"artifactset.h" "5" -"artifactvisitor.h" "5" -"buildgraph.h" "5" -"buildgraphloader.h" "5" -"buildgraphnode.h" "5" -"buildgraphvisitor.h" "5" -"command.h" "5" -"cycledetector.h" "5" -"depscanner.h" "5" -"executor.h" "5" -"executorjob.h" "5" -"filedependency.h" "5" -"forward_decls.h" "5" -"inputartifactscanner.h" "5" -"jscommandexecutor.h" "5" -"nodeset.h" "5" -"processcommandexecutor.h" "5" -"productbuilddata.h" "5" -"productinstaller.h" "5" -"projectbuilddata.h" "5" -"qtmocscanner.h" "5" -"rescuableartifactdata.h" "5" -"rulegraph.h" "5" -"rulenode.h" "5" -"rulesapplicator.h" "5" -"rulesevaluationcontext.h" "5" -"scanresultcache.h" "5" -"timestampsupdater.h" "5" -"transformer.h" "5" -"tst_buildgraph.h" "5" -"Sources" "4" -"abstractcommandexecutor.cpp" "5" -"artifact.cpp" "5" -"artifactcleaner.cpp" "5" -"artifactset.cpp" "5" -"artifactvisitor.cpp" "5" -"buildgraph.cpp" "5" -"buildgraphloader.cpp" "5" -"buildgraphnode.cpp" "5" -"command.cpp" "5" -"cycledetector.cpp" "5" -"depscanner.cpp" "5" -"executor.cpp" "5" -"executorjob.cpp" "5" -"filedependency.cpp" "5" -"inputartifactscanner.cpp" "5" -"jscommandexecutor.cpp" "5" -"nodeset.cpp" "5" -"processcommandexecutor.cpp" "5" -"productbuilddata.cpp" "5" -"productinstaller.cpp" "5" -"projectbuilddata.cpp" "5" -"qtmocscanner.cpp" "5" -"rescuableartifactdata.cpp" "5" -"rulegraph.cpp" "5" -"rulenode.cpp" "5" -"rulesapplicator.cpp" "5" -"rulesevaluationcontext.cpp" "5" -"scanresultcache.cpp" "5" -"timestampsupdater.cpp" "5" -"transformer.cpp" "5" -"tst_buildgraph.cpp" "5" -"jsextensions" "3" -"jsextensions.pri" "4" -"Headers" "4" -"domxml.h" "5" -"file.h" "5" -"jsextensions.h" "5" -"moduleproperties.h" "5" -"process.h" "5" -"propertylist.h" "5" -"textfile.h" "5" -"Sources" "4" -"domxml.cpp" "5" -"file.cpp" "5" -"jsextensions.cpp" "5" -"moduleproperties.cpp" "5" -"process.cpp" "5" -"propertylist.mm" "5" -"textfile.cpp" "5" -"language" "3" -"language.pri" "4" -"Headers" "4" -"artifactproperties.h" "5" -"asttools.h" "5" -"builtindeclarations.h" "5" -"builtinvalue.h" "5" -"evaluationdata.h" "5" -"evaluator.h" "5" -"evaluatorscriptclass.h" "5" -"filecontext.h" "5" -"filecontextbase.h" "5" -"filetags.h" "5" -"forward_decls.h" "5" -"functiondeclaration.h" "5" -"identifiersearch.h" "5" -"importversion.h" "5" -"item.h" "5" -"itemdeclaration.h" "5" -"itemobserver.h" "5" -"itempool.h" "5" -"itemreader.h" "5" -"itemreaderastvisitor.h" "5" -"jsimports.h" "5" -"language.h" "5" -"loader.h" "5" -"moduleloader.h" "5" -"preparescriptobserver.h" "5" -"projectresolver.h" "5" -"property.h" "5" -"propertydeclaration.h" "5" -"propertymapinternal.h" "5" -"resolvedfilecontext.h" "5" -"scriptengine.h" "5" -"scriptpropertyobserver.h" "5" -"tst_language.h" "5" -"value.h" "5" -"Sources" "4" -"artifactproperties.cpp" "5" -"asttools.cpp" "5" -"builtindeclarations.cpp" "5" -"builtinvalue.cpp" "5" -"evaluator.cpp" "5" -"evaluatorscriptclass.cpp" "5" -"filecontext.cpp" "5" -"filecontextbase.cpp" "5" -"filetags.cpp" "5" -"identifiersearch.cpp" "5" -"importversion.cpp" "5" -"item.cpp" "5" -"itemdeclaration.cpp" "5" -"itempool.cpp" "5" -"itemreader.cpp" "5" -"itemreaderastvisitor.cpp" "5" -"language.cpp" "5" -"loader.cpp" "5" -"moduleloader.cpp" "5" -"preparescriptobserver.cpp" "5" -"projectresolver.cpp" "5" -"propertydeclaration.cpp" "5" -"propertymapinternal.cpp" "5" -"resolvedfilecontext.cpp" "5" -"scriptengine.cpp" "5" -"tst_language.cpp" "5" -"value.cpp" "5" -"Other files" "4" -"testdata" "5" -"aboutdialog.cpp" "6" -"Banana" "6" -"baseproperty.qbs" "6" -"baseproperty_base.qbs" "6" -"buildconfigstringlistsyntax.qbs" "6" -"builtinFunctionInSearchPathsProperty.qbs" "6" -"canonicalArchitecture.qbs" "6" -"conditionaldepends.qbs" "6" -"conditionaldepends_base.qbs" "6" -"drawline.asm" "6" -"environmentvariable.qbs" "6" -"exports.qbs" "6" -"exports_product.qbs" "6" -"filecontextproperties.qbs" "6" -"filetags.qbs" "6" -"getNativeSetting.qbs" "6" -"groupconditions.qbs" "6" -"groupname.qbs" "6" -"homeDirectory.qbs" "6" -"idusage.qbs" "6" -"idusagebase.qbs" "6" -"invalidBindingInDisabledItem.qbs" "6" -"jsextensions.js" "6" -"jsimportsinmultiplescopes.js" "6" -"jsimportsinmultiplescopes.qbs" "6" -"main.cpp" "6" -"moduleproperties.qbs" "6" -"modules.qbs" "6" -"modulescope.qbs" "6" -"modulescope_base.qbs" "6" -"narf" "6" -"narf.zort" "6" -"nativesettings.ini" "6" -"outerInGroup.qbs" "6" -"pathproperties.qbs" "6" -"productconditions.qbs" "6" -"productdirectories.qbs" "6" -"profilevaluesandoverriddenvalues.qbs" "6" -"propertiesblocks.qbs" "6" -"propertiesblocks_base.qbs" "6" -"zort" "6" -"library" "3" -"library.pri" "4" -"library_dirname" "3" -"library_dirname.pri" "4" -"logging" "3" -"logging.pri" "4" -"Headers" "4" -"ilogsink.h" "5" -"logger.h" "5" -"translator.h" "5" -"Sources" "4" -"ilogsink.cpp" "5" -"logger.cpp" "5" -"parser" "3" -"parser.pri" "4" -"Headers" "4" -"qmlerror.h" "5" -"qmljsast_p.h" "5" -"qmljsastfwd_p.h" "5" -"qmljsastvisitor_p.h" "5" -"qmljsengine_p.h" "5" -"qmljsglobal_p.h" "5" -"qmljsgrammar_p.h" "5" -"qmljskeywords_p.h" "5" -"qmljslexer_p.h" "5" -"qmljsmemorypool_p.h" "5" -"qmljsparser_p.h" "5" -"Sources" "4" -"qmlerror.cpp" "5" -"qmljsast.cpp" "5" -"qmljsastvisitor.cpp" "5" -"qmljsengine_p.cpp" "5" -"qmljsgrammar.cpp" "5" -"qmljslexer.cpp" "5" -"qmljsparser.cpp" "5" -"qbs_version" "3" -"qbs_version.pri" "4" -"tools" "3" -"tools.pri" "4" -"Headers" "4" -"buildoptions.h" "5" -"cleanoptions.h" "5" -"codelocation.h" "5" -"error.h" "5" -"fileinfo.h" "5" -"filetime.h" "5" -"hostosinfo.h" "5" -"id.h" "5" -"installoptions.h" "5" -"persistence.h" "5" -"persistentobject.h" "5" -"preferences.h" "5" -"processresult.h" "5" -"processresult_p.h" "5" -"profile.h" "5" -"progressobserver.h" "5" -"propertyfinder.h" "5" -"qbs_export.h" "5" -"qbsassert.h" "5" -"qttools.h" "5" -"scannerpluginmanager.h" "5" -"scripttools.h" "5" -"settings.h" "5" -"setupprojectparameters.h" "5" -"tst_tools.h" "5" -"weakpointer.h" "5" -"Sources" "4" -"buildoptions.cpp" "5" -"cleanoptions.cpp" "5" -"codelocation.cpp" "5" -"error.cpp" "5" -"fileinfo.cpp" "5" -"filetime_unix.cpp" "5" -"filetime_win.cpp" "5" -"id.cpp" "5" -"installoptions.cpp" "5" -"persistence.cpp" "5" -"preferences.cpp" "5" -"processresult.cpp" "5" -"profile.cpp" "5" -"progressobserver.cpp" "5" -"propertyfinder.cpp" "5" -"qbsassert.cpp" "5" -"qttools.cpp" "5" -"scannerpluginmanager.cpp" "5" -"scripttools.cpp" "5" -"settings.cpp" "5" -"setupprojectparameters.cpp" "5" -"tst_tools.cpp" "5" -"Headers" "3" -"qbs.h" "4" -"Other files" "3" -"qbs_version.pri" "5" -"use_installed_corelib.pri" "4" "cplusplus" "2" "cplusplus.pro" "3" "cplusplus" "3" @@ -2204,6 +2383,8 @@ "qtcreator_pch.h" "6" "rpath" "3" "rpath.pri" "4" +"utils_dependencies" "3" +"utils_dependencies.pri" "4" "Headers" "3" "extensionsystem_global.h" "4" "invoker.h" "4" @@ -2323,36 +2504,6 @@ "languageutils.qbs" "4" "languageutils_dependencies" "2" "languageutils_dependencies.pri" "3" -"plugins" "2" -"plugins.pro" "3" -"scanner" "3" -"scanner.pro" "4" -"cpp" "4" -"cpp.pro" "5" -"library_dirname" "5" -"library_dirname.pri" "6" -"plugins" "5" -"plugins.pri" "6" -"Headers" "5" -"scanner.h" "7" -"CPlusPlusForwardDeclarations.h" "6" -"cpp_global.h" "6" -"Lexer.h" "6" -"Token.h" "6" -"Sources" "5" -"cppscanner.cpp" "6" -"Lexer.cpp" "6" -"Token.cpp" "6" -"qt" "4" -"qt.pro" "5" -"library_dirname" "5" -"library_dirname.pri" "6" -"plugins" "5" -"plugins.pri" "6" -"Headers" "5" -"scanner.h" "7" -"Sources" "5" -"qtscanner.cpp" "6" "process_ctrlc_stub" "2" "process_ctrlc_stub.pro" "3" "qtcreator" "3" @@ -2676,6 +2827,7 @@ "qmljsconstants.h" "5" "qmljscontext.h" "5" "qmljsdelta.h" "5" +"qmljsdescribevalue.h" "5" "qmljsdocument.h" "5" "qmljsevaluate.h" "5" "qmljsfindexportedcpptypes.h" "5" @@ -2714,6 +2866,7 @@ "qmljscompletioncontextfinder.cpp" "5" "qmljscontext.cpp" "5" "qmljsdelta.cpp" "5" +"qmljsdescribevalue.cpp" "5" "qmljsdocument.cpp" "5" "qmljsevaluate.cpp" "5" "qmljsfindexportedcpptypes.cpp" "5" @@ -2766,6 +2919,8 @@ "qmljs.qbs" "4" "qmljs_dependencies" "2" "qmljs_dependencies.pri" "3" +"qtcreator" "2" +"qtcreator.pri" "3" "qtcreatorcdbext" "2" "qtcreatorcdbext.pro" "3" "cdb_detect" "3" @@ -2799,38 +2954,6 @@ "symbolgroup.cpp" "4" "symbolgroupnode.cpp" "4" "symbolgroupvalue.cpp" "4" -"qtprofilesetup" "2" -"qtprofilesetup.pro" "3" -"library" "3" -"library.pri" "4" -"library_dirname" "3" -"library_dirname.pri" "4" -"qbs_version" "3" -"qbs_version.pri" "4" -"use_corelib" "3" -"use_corelib.pri" "4" -"Headers" "3" -"qtprofilesetup.h" "4" -"Sources" "3" -"qtprofilesetup.cpp" "4" -"Resources" "3" -"templates.qrc" "4" -"/" "5" -"templates/core.qbs" "6" -"templates/gui.qbs" "6" -"templates/moc.js" "6" -"templates/module.qbs" "6" -"templates/qtfunctions.js" "6" -"templates/QtModule.qbs" "6" -"Other files" "3" -"templates" "4" -"core.qbs" "5" -"gui.qbs" "5" -"moc.js" "5" -"module.qbs" "5" -"qtfunctions.js" "5" -"QtModule.qbs" "5" -"use_installed_qtprofilesetup.pri" "4" "ssh" "2" "ssh.pro" "3" "botan" "3" @@ -2919,179 +3042,6 @@ "ssh.qbs" "4" "ssh_dependencies" "2" "ssh_dependencies.pri" "3" -"static" "2" -"static.pro" "3" -"Sources" "3" -"bin" "4" -"ibmsvc.xml" "5" -"ibqbs.bat" "5" -"share/qbs" "4" -"imports/qbs" "5" -"base" "6" -"Application.qbs" "7" -"CppApplication.qbs" "7" -"DynamicLibrary.qbs" "7" -"NSISSetup.qbs" "7" -"StaticLibrary.qbs" "7" -"WindowsInstallerPackage.qbs" "7" -"WindowsSetupPackage.qbs" "7" -"FileInfo" "6" -"fileinfo.js" "7" -"ModUtils" "6" -"utils.js" "7" -"Probes" "6" -"BinaryProbe.qbs" "7" -"FrameworkProbe.qbs" "7" -"IncludeProbe.qbs" "7" -"PathProbe.qbs" "7" -"PkgConfigProbe.qbs" "7" -"utils.js" "7" -"modules" "5" -"cpp" "6" -"bundle-tools.js" "7" -"CppModule.qbs" "7" -"darwin-tools.js" "7" -"DarwinGCC.qbs" "7" -"gcc.js" "7" -"GenericGCC.qbs" "7" -"genericunix-gcc.qbs" "7" -"ios-gcc.qbs" "7" -"linux-gcc.qbs" "7" -"msvc.js" "7" -"osx-gcc.qbs" "7" -"path-tools.js" "7" -"UnixGCC.qbs" "7" -"windows-mingw.qbs" "7" -"windows-msvc.qbs" "7" -"windows.js" "7" -"ib" "6" -"IBModule.qbs" "7" -"nsis" "6" -"NSISModule.qbs" "7" -"qbs" "6" -"common.qbs" "7" -"wix" "6" -"WiXModule.qbs" "7" -"Other files" "3" -"bin" "4" -"ibmsvc.xml" "5" -"ibqbs.bat" "5" -"examples" "4" -"app-and-lib" "5" -"app" "6" -"app.qbs" "7" -"main.cpp" "7" -"lib" "6" -"lib.cpp" "7" -"lib.qbs" "7" -"app_and_lib.qbs" "6" -"cocoa-application" "5" -"CocoaApplication" "6" -"en.lproj" "7" -"Credits.rtf" "8" -"InfoPlist.strings" "8" -"MainMenu.xib" "8" -"AppDelegate.h" "7" -"AppDelegate.m" "7" -"CocoaApplication-Info.plist" "7" -"CocoaApplication-Prefix.pch" "7" -"main.m" "7" -"CocoaApplication.xcodeproj" "6" -"project.pbxproj" "7" -"CocoaApplication.qbs" "6" -"cocoa-touch-application" "5" -"CocoaTouchApplication" "6" -"en.lproj" "7" -"DetailViewController_iPad.xib" "8" -"DetailViewController_iPhone.xib" "8" -"InfoPlist.strings" "8" -"MasterViewController_iPad.xib" "8" -"MasterViewController_iPhone.xib" "8" -"AppDelegate.h" "7" -"AppDelegate.m" "7" -"CocoaTouchApplication-Info.plist" "7" -"CocoaTouchApplication-Prefix.pch" "7" -"Default-568h@2x.png" "7" -"Default.png" "7" -"Default@2x.png" "7" -"DetailViewController.h" "7" -"DetailViewController.m" "7" -"main.m" "7" -"MasterViewController.h" "7" -"MasterViewController.m" "7" -"CocoaTouchApplication.xcodeproj" "6" -"project.pbxproj" "7" -"CocoaTouchApplication.qbs" "6" -"collidingmice" "5" -"images" "6" -"cheese.jpg" "7" -"collidingmice.qbs" "6" -"main.cpp" "6" -"mice.qrc" "6" -"mouse.cpp" "6" -"mouse.h" "6" -"helloworld-complex" "5" -"src" "6" -"foo.cpp" "7" -"foo.h" "7" -"main.cpp" "7" -"specialfeature.cpp" "7" -"specialfeature.h" "7" -"hello.qbs" "6" -"helloworld-minimal" "5" -"hello.qbs" "6" -"main.cpp" "6" -"helloworld-qt" "5" -"hello.qbs" "6" -"main.cpp" "6" -"examples.qbs" "5" -"share/qbs" "4" -"imports/qbs" "5" -"base" "6" -"Application.qbs" "7" -"CppApplication.qbs" "7" -"DynamicLibrary.qbs" "7" -"NSISSetup.qbs" "7" -"StaticLibrary.qbs" "7" -"WindowsInstallerPackage.qbs" "7" -"WindowsSetupPackage.qbs" "7" -"FileInfo" "6" -"fileinfo.js" "7" -"ModUtils" "6" -"utils.js" "7" -"Probes" "6" -"BinaryProbe.qbs" "7" -"FrameworkProbe.qbs" "7" -"IncludeProbe.qbs" "7" -"PathProbe.qbs" "7" -"PkgConfigProbe.qbs" "7" -"utils.js" "7" -"modules" "5" -"cpp" "6" -"bundle-tools.js" "7" -"CppModule.qbs" "7" -"darwin-tools.js" "7" -"DarwinGCC.qbs" "7" -"gcc.js" "7" -"GenericGCC.qbs" "7" -"genericunix-gcc.qbs" "7" -"ios-gcc.qbs" "7" -"linux-gcc.qbs" "7" -"msvc.js" "7" -"osx-gcc.qbs" "7" -"path-tools.js" "7" -"UnixGCC.qbs" "7" -"windows-mingw.qbs" "7" -"windows-msvc.qbs" "7" -"windows.js" "7" -"ib" "6" -"IBModule.qbs" "7" -"nsis" "6" -"NSISModule.qbs" "7" -"qbs" "6" -"common.qbs" "7" -"wix" "6" -"WiXModule.qbs" "7" "utils" "2" "utils.pro" "3" "private_headers" "3" @@ -3114,6 +3064,7 @@ "tipcontents.h" "6" "tips.h" "6" "tooltip.h" "6" +"algorithm.h" "5" "annotateditemdelegate.h" "5" "ansiescapecodehandler.h" "5" "appmainwindow.h" "5" @@ -3144,15 +3095,14 @@ "filesearch.h" "5" "filesystemwatcher.h" "5" "fileutils.h" "5" -"filewizarddialog.h" "5" "filewizardpage.h" "5" "flowlayout.h" "5" -"function.h" "5" "headerviewstretcher.h" "5" "historycompleter.h" "5" "hostosinfo.h" "5" "htmldocextractor.h" "5" "ipaddresslineedit.h" "5" +"itemviews.h" "5" "iwelcomepage.h" "5" "json.h" "5" "linecolumnlabel.h" "5" @@ -3173,14 +3123,17 @@ "projectintropage.h" "5" "projectnamevalidatinglineedit.h" "5" "proxyaction.h" "5" +"proxycredentialsdialog.h" "5" "qtcassert.h" "5" "qtcolorbutton.h" "5" +"QtConcurrentTools" "5" "qtcoverride.h" "5" "qtcprocess.h" "5" "reloadpromptutils.h" "5" "runextensions.h" "5" "savedaction.h" "5" "savefile.h" "5" +"scopedswap.h" "5" "settingsselector.h" "5" "sleep.h" "5" "statuslabel.h" "5" @@ -3190,6 +3143,7 @@ "synchronousprocess.h" "5" "tcpportsgatherer.h" "5" "textfileformat.h" "5" +"treeviewcombobox.h" "5" "uncommentselection.h" "5" "unixutils.h" "5" "utils_global.h" "5" @@ -3231,15 +3185,14 @@ "filesearch.cpp" "5" "filesystemwatcher.cpp" "5" "fileutils.cpp" "5" -"filewizarddialog.cpp" "5" "filewizardpage.cpp" "5" "flowlayout.cpp" "5" -"function.cpp" "5" "headerviewstretcher.cpp" "5" "historycompleter.cpp" "5" "hostosinfo.cpp" "5" "htmldocextractor.cpp" "5" "ipaddresslineedit.cpp" "5" +"itemviews.cpp" "5" "iwelcomepage.cpp" "5" "json.cpp" "5" "linecolumnlabel.cpp" "5" @@ -3255,6 +3208,7 @@ "projectintropage.cpp" "5" "projectnamevalidatinglineedit.cpp" "5" "proxyaction.cpp" "5" +"proxycredentialsdialog.cpp" "5" "qtcassert.cpp" "5" "qtcolorbutton.cpp" "5" "qtcprocess.cpp" "5" @@ -3270,6 +3224,7 @@ "synchronousprocess.cpp" "5" "tcpportsgatherer.cpp" "5" "textfileformat.cpp" "5" +"treeviewcombobox.cpp" "5" "uncommentselection.cpp" "5" "unixutils.cpp" "5" "winutils.cpp" "5" @@ -3278,6 +3233,7 @@ "filewizardpage.ui" "5" "newclasswidget.ui" "5" "projectintropage.ui" "5" +"proxycredentialsdialog.ui" "5" "Resources" "4" "utils.qrc" "5" "/utils" "6" @@ -3325,6 +3281,8 @@ "zeroconf.qbs" "4" "zeroconf_dependencies" "2" "zeroconf_dependencies.pri" "3" +"Other files" "2" +"libs.qbs" "3" "plugins" "1" "plugins.pro" "2" "analyzerbase" "2" @@ -3484,6 +3442,7 @@ "androidsettingswidget.h" "4" "androidsignaloperation.h" "4" "androidtoolchain.h" "4" +"avddialog.h" "4" "certificatesmodel.h" "4" "createandroidmanifestwizard.h" "4" "javaautocompleter.h" "4" @@ -3533,6 +3492,7 @@ "androidsettingswidget.cpp" "4" "androidsignaloperation.cpp" "4" "androidtoolchain.cpp" "4" +"avddialog.cpp" "4" "certificatesmodel.cpp" "4" "createandroidmanifestwizard.cpp" "4" "javaautocompleter.cpp" "4" @@ -3701,9 +3661,6 @@ "baremetalrunconfigurationfactory.cpp" "4" "baremetalrunconfigurationwidget.cpp" "4" "baremetalruncontrolfactory.cpp" "4" -"Forms" "3" -"baremetaldeviceconfigurationwidget.ui" "4" -"baremetaldeviceconfigurationwizardsetuppage.ui" "4" "Other files" "3" "baremetal.qbs" "4" "baremetal_dependencies" "2" @@ -3850,6 +3807,7 @@ "beautifierabstracttool.h" "4" "beautifierconstants.h" "4" "beautifierplugin.h" "4" +"command.h" "4" "configurationdialog.h" "4" "configurationeditor.h" "4" "configurationpanel.h" "4" @@ -3868,6 +3826,7 @@ "uncrustifysettings.cpp" "5" "abstractsettings.cpp" "4" "beautifierplugin.cpp" "4" +"command.cpp" "4" "configurationdialog.cpp" "4" "configurationeditor.cpp" "4" "configurationpanel.cpp" "4" @@ -3882,8 +3841,9 @@ "configurationpanel.ui" "4" "Resources" "3" "beautifier.qrc" "4" -"/" "5" +"/beautifier" "5" "images/beautifier.png" "6" +"images/beautifier@2x.png" "6" "Other files" "3" "beautifier.qbs" "4" "beautifier_dependencies" "2" @@ -4159,8 +4119,6 @@ "classviewsymbollocation.cpp" "4" "classviewtreeitemmodel.cpp" "4" "classviewutils.cpp" "4" -"Forms" "3" -"classviewnavigationwidget.ui" "4" "Resources" "3" "classview.qrc" "4" "/classview" "5" @@ -4294,7 +4252,6 @@ "cmakeeditorfactory.h" "4" "cmakefilecompletionassist.h" "4" "cmakehighlighter.h" "4" -"cmakehighlighterfactory.h" "4" "cmakelocatorfilter.h" "4" "cmakeopenprojectwizard.h" "4" "cmakeparser.h" "4" @@ -4304,7 +4261,9 @@ "cmakeprojectnodes.h" "4" "cmakeprojectplugin.h" "4" "cmakerunconfiguration.h" "4" -"cmakevalidator.h" "4" +"cmakesettingspage.h" "4" +"cmaketool.h" "4" +"generatorinfo.h" "4" "makestep.h" "4" "Sources" "3" "cmakebuildconfiguration.cpp" "4" @@ -4312,7 +4271,6 @@ "cmakeeditorfactory.cpp" "4" "cmakefilecompletionassist.cpp" "4" "cmakehighlighter.cpp" "4" -"cmakehighlighterfactory.cpp" "4" "cmakelocatorfilter.cpp" "4" "cmakeopenprojectwizard.cpp" "4" "cmakeparser.cpp" "4" @@ -4321,7 +4279,9 @@ "cmakeprojectnodes.cpp" "4" "cmakeprojectplugin.cpp" "4" "cmakerunconfiguration.cpp" "4" -"cmakevalidator.cpp" "4" +"cmakesettingspage.cpp" "4" +"cmaketool.cpp" "4" +"generatorinfo.cpp" "4" "makestep.cpp" "4" "Resources" "3" "cmakeproject.qrc" "4" @@ -4460,7 +4420,6 @@ "addtovcsdialog.h" "5" "externaltoolconfig.h" "5" "ioptionspage.h" "5" -"iwizard.h" "5" "newdialog.h" "5" "openwithdialog.h" "5" "promptoverwritedialog.h" "5" @@ -4485,6 +4444,7 @@ "progressmanager_p.h" "5" "progressview.h" "5" "basefilewizard.h" "4" +"basefilewizardfactory.h" "4" "core_global.h" "4" "coreconstants.h" "4" "coreplugin.h" "4" @@ -4515,7 +4475,7 @@ "infobar.h" "4" "ioutputpane.h" "4" "iversioncontrol.h" "4" -"macfullscreen.h" "4" +"iwizardfactory.h" "4" "mainwindow.h" "4" "manhattanstyle.h" "4" "messagemanager.h" "4" @@ -4530,6 +4490,7 @@ "outputpane.h" "4" "outputpanemanager.h" "4" "outputwindow.h" "4" +"patchtool.h" "4" "plugindialog.h" "4" "removefiledialog.h" "4" "rightpane.h" "4" @@ -4547,6 +4508,7 @@ "variablemanager.h" "4" "vcsmanager.h" "4" "versiondialog.h" "4" +"windowsupport.h" "4" "Sources" "3" "actionmanager" "4" "actioncontainer.cpp" "5" @@ -4559,7 +4521,6 @@ "addtovcsdialog.cpp" "5" "externaltoolconfig.cpp" "5" "ioptionspage.cpp" "5" -"iwizard.cpp" "5" "newdialog.cpp" "5" "openwithdialog.cpp" "5" "promptoverwritedialog.cpp" "5" @@ -4586,6 +4547,7 @@ "progressmanager_x11.cpp" "5" "progressview.cpp" "5" "basefilewizard.cpp" "4" +"basefilewizardfactory.cpp" "4" "coreplugin.cpp" "4" "designmode.cpp" "4" "documentmanager.cpp" "4" @@ -4606,12 +4568,13 @@ "icorelistener.cpp" "4" "id.cpp" "4" "idocument.cpp" "4" +"idocumentfactory.cpp" "4" "imode.cpp" "4" "inavigationwidgetfactory.cpp" "4" "infobar.cpp" "4" "ioutputpane.cpp" "4" "iversioncontrol.cpp" "4" -"macfullscreen.mm" "4" +"iwizardfactory.cpp" "4" "mainwindow.cpp" "4" "manhattanstyle.cpp" "4" "messagemanager.cpp" "4" @@ -4626,6 +4589,7 @@ "outputpane.cpp" "4" "outputpanemanager.cpp" "4" "outputwindow.cpp" "4" +"patchtool.cpp" "4" "plugindialog.cpp" "4" "removefiledialog.cpp" "4" "rightpane.cpp" "4" @@ -4643,6 +4607,7 @@ "variablemanager.cpp" "4" "vcsmanager.cpp" "4" "versiondialog.cpp" "4" +"windowsupport.cpp" "4" "Forms" "3" "dialogs" "4" "addtovcsdialog.ui" "5" @@ -4655,55 +4620,65 @@ "mimetypemagicdialog.ui" "4" "mimetypesettingspage.ui" "4" "removefiledialog.ui" "4" -"variablechooser.ui" "4" "Resources" "3" "core.qrc" "4" "/core" "5" "editormanager/BinFiles.mimetypes.xml" "6" "images/arrowdown.png" "6" +"images/arrowdown@2x.png" "6" "images/arrowup.png" "6" +"images/arrowup@2x.png" "6" "images/button_close.png" "6" -"images/category_buildrun.png" "6" +"images/button_close@2x.png" "6" "images/category_core.png" "6" -"images/category_cpaster.png" "6" -"images/category_cpp.png" "6" -"images/category_debug.png" "6" "images/category_design.png" "6" -"images/category_fakevim.png" "6" -"images/category_help.png" "6" "images/category_locator.png" "6" -"images/category_qml.png" "6" "images/category_texteditor.png" "6" -"images/category_vcs.png" "6" "images/clean_pane_small.png" "6" "images/clear.png" "6" +"images/clear@2x.png" "6" "images/closebutton.png" "6" "images/compile_error_taskbar.png" "6" +"images/compile_error_taskbar@2x.png" "6" "images/darkarrowdown.png" "6" +"images/darkarrowdown@2x.png" "6" "images/darkarrowup.png" "6" +"images/darkarrowup@2x.png" "6" "images/darkclose.png" "6" +"images/darkclose@2x.png" "6" "images/darkclosebutton.png" "6" +"images/darkclosebutton@2x.png" "6" "images/dir.png" "6" "images/editclear.png" "6" +"images/editclear@2x.png" "6" "images/editcopy.png" "6" "images/editcut.png" "6" "images/editpaste.png" "6" "images/empty14.png" "6" +"images/error.png" "6" +"images/error@2x.png" "6" "images/extension.png" "6" +"images/extension@2x.png" "6" "images/filenew.png" "6" "images/fileopen.png" "6" "images/filesave.png" "6" "images/filtericon.png" "6" +"images/filtericon@2x.png" "6" "images/find.png" "6" "images/findnext.png" "6" "images/help.png" "6" +"images/info.png" "6" +"images/info@2x.png" "6" "images/inputfield.png" "6" "images/inputfield_disabled.png" "6" "images/linkicon.png" "6" +"images/linkicon@2x.png" "6" "images/locked.png" "6" +"images/locked@2x.png" "6" "images/logo/128/QtProject-qtcreator.png" "6" "images/logo/32/QtProject-qtcreator.png" "6" "images/magnifier.png" "6" +"images/magnifier@2x.png" "6" "images/minus.png" "6" "images/next.png" "6" "images/panel_button.png" "6" @@ -4720,35 +4695,37 @@ "images/pushbutton_hover.png" "6" "images/pushbutton_pressed.png" "6" "images/redo.png" "6" +"images/reload_gray.png" "6" +"images/reload_gray@2x.png" "6" "images/replace.png" "6" "images/reset.png" "6" "images/sidebaricon.png" "6" -"images/sidebysidediff.png" "6" "images/splitbutton_closebottom.png" "6" +"images/splitbutton_closebottom@2x.png" "6" "images/splitbutton_closeleft.png" "6" +"images/splitbutton_closeleft@2x.png" "6" "images/splitbutton_closeright.png" "6" +"images/splitbutton_closeright@2x.png" "6" "images/splitbutton_closetop.png" "6" +"images/splitbutton_closetop@2x.png" "6" "images/splitbutton_horizontal.png" "6" +"images/splitbutton_horizontal@2x.png" "6" "images/splitbutton_vertical.png" "6" +"images/splitbutton_vertical@2x.png" "6" "images/statusbar.png" "6" -"images/textdiff.png" "6" -"images/topbaricon.png" "6" "images/undo.png" "6" "images/unknownfile.png" "6" "images/unlocked.png" "6" +"images/unlocked@2x.png" "6" +"images/warning.png" "6" +"images/warning@2x.png" "6" "fancyactionbar.qrc" "4" "/fancyactionbar" "5" -"images/mode_Debug.png" "6" -"images/mode_Debug@2x.png" "6" "images/mode_Design.png" "6" "images/mode_Design@2x.png" "6" "images/mode_Edit.png" "6" "images/mode_Edit@2x.png" "6" "images/mode_Output.png" "6" -"images/mode_Project.png" "6" -"images/mode_Project@2x.png" "6" -"images/mode_Reference.png" "6" -"images/mode_Reference@2x.png" "6" "Other files" "3" "editormanager" "4" "BinFiles.mimetypes.xml" "5" @@ -4822,6 +4799,10 @@ "pasteselect.ui" "4" "pasteview.ui" "4" "settingspage.ui" "4" +"Resources" "3" +"cpaster.qrc" "4" +"/cpaster" "5" +"images/category_cpaster.png" "6" "Other files" "3" "cpaster.qbs" "4" "cpaster_dependencies" "2" @@ -4863,12 +4844,16 @@ "utils_dependencies.pri" "4" "Headers" "3" "cppautocompleter.h" "4" +"cppcanonicalsymbol.h" "4" "cppclasswizard.h" "4" "cppcodemodelinspectordialog.h" "4" +"cppdocumentationcommenthelper.h" "4" "cppeditor.h" "4" "cppeditor_global.h" "4" "cppeditorconstants.h" "4" +"cppeditordocument.h" "4" "cppeditorenums.h" "4" +"cppeditoroutline.h" "4" "cppeditorplugin.h" "4" "cppeditortestcase.h" "4" "cppelementevaluator.h" "4" @@ -4876,13 +4861,13 @@ "cppfollowsymbolundercursor.h" "4" "cppfunctiondecldeflink.h" "4" "cpphighlighter.h" "4" -"cpphighlighterfactory.h" "4" "cpphoverhandler.h" "4" "cppincludehierarchy.h" "4" "cppincludehierarchyitem.h" "4" "cppincludehierarchymodel.h" "4" "cppincludehierarchytreeview.h" "4" "cppinsertvirtualmethods.h" "4" +"cpplocalrenaming.h" "4" "cppoutline.h" "4" "cpppreprocessordialog.h" "4" "cppquickfix.h" "4" @@ -4895,10 +4880,14 @@ "cppvirtualfunctionproposalitem.h" "4" "Sources" "3" "cppautocompleter.cpp" "4" +"cppcanonicalsymbol.cpp" "4" "cppclasswizard.cpp" "4" "cppcodemodelinspectordialog.cpp" "4" +"cppdocumentationcommenthelper.cpp" "4" "cppdoxygen_test.cpp" "4" "cppeditor.cpp" "4" +"cppeditordocument.cpp" "4" +"cppeditoroutline.cpp" "4" "cppeditorplugin.cpp" "4" "cppeditortestcase.cpp" "4" "cppelementevaluator.cpp" "4" @@ -4906,7 +4895,6 @@ "cppfollowsymbolundercursor.cpp" "4" "cppfunctiondecldeflink.cpp" "4" "cpphighlighter.cpp" "4" -"cpphighlighterfactory.cpp" "4" "cpphoverhandler.cpp" "4" "cppincludehierarchy.cpp" "4" "cppincludehierarchy_test.cpp" "4" @@ -4914,6 +4902,7 @@ "cppincludehierarchymodel.cpp" "4" "cppincludehierarchytreeview.cpp" "4" "cppinsertvirtualmethods.cpp" "4" +"cpplocalrenaming.cpp" "4" "cppoutline.cpp" "4" "cpppreprocessordialog.cpp" "4" "cppquickfix.cpp" "4" @@ -5005,13 +4994,13 @@ "cppmodelmanagersupport.h" "4" "cppmodelmanagersupportinternal.h" "4" "cpppointerdeclarationformatter.h" "4" -"cpppreprocessertesthelper.h" "4" -"cpppreprocessor.h" "4" "cppprojectfile.h" "4" "cppqtstyleindenter.h" "4" "cpprefactoringchanges.h" "4" "cppsemanticinfo.h" "4" "cppsnapshotupdater.h" "4" +"cppsourceprocessertesthelper.h" "4" +"cppsourceprocessor.h" "4" "cpptools_global.h" "4" "cpptoolsconstants.h" "4" "cpptoolseditorsupport.h" "4" @@ -5022,9 +5011,11 @@ "doxygengenerator.h" "4" "functionutils.h" "4" "includeutils.h" "4" +"indexitem.h" "4" "insertionpointlocator.h" "4" "modelmanagertesthelper.h" "4" "searchsymbols.h" "4" +"stringtable.h" "4" "symbolfinder.h" "4" "symbolsfindfilter.h" "4" "typehierarchybuilder.h" "4" @@ -5057,6 +5048,7 @@ "cpphighlightingsupportinternal.cpp" "4" "cppindexingsupport.cpp" "4" "cpplocalsymbols.cpp" "4" +"cpplocalsymbols_test.cpp" "4" "cpplocatordata.cpp" "4" "cpplocatorfilter.cpp" "4" "cpplocatorfilter_test.cpp" "4" @@ -5067,14 +5059,14 @@ "cppmodelmanagersupportinternal.cpp" "4" "cpppointerdeclarationformatter.cpp" "4" "cpppointerdeclarationformatter_test.cpp" "4" -"cpppreprocessertesthelper.cpp" "4" -"cpppreprocessor.cpp" "4" -"cpppreprocessor_test.cpp" "4" "cppprojectfile.cpp" "4" "cppqtstyleindenter.cpp" "4" "cpprefactoringchanges.cpp" "4" "cppsemanticinfo.cpp" "4" "cppsnapshotupdater.cpp" "4" +"cppsourceprocessertesthelper.cpp" "4" +"cppsourceprocessor.cpp" "4" +"cppsourceprocessor_test.cpp" "4" "cpptoolseditorsupport.cpp" "4" "cpptoolsplugin.cpp" "4" "cpptoolsreuse.cpp" "4" @@ -5083,9 +5075,11 @@ "doxygengenerator.cpp" "4" "functionutils.cpp" "4" "includeutils.cpp" "4" +"indexitem.cpp" "4" "insertionpointlocator.cpp" "4" "modelmanagertesthelper.cpp" "4" "searchsymbols.cpp" "4" +"stringtable.cpp" "4" "symbolfinder.cpp" "4" "symbolsearcher_test.cpp" "4" "symbolsfindfilter.cpp" "4" @@ -5096,6 +5090,10 @@ "cppcodemodelsettingspage.ui" "4" "cppcodestylesettingspage.ui" "4" "cppfilesettingspage.ui" "4" +"Resources" "3" +"cpptools.qrc" "4" +"/cpptools" "5" +"images/category_cpp.png" "6" "Other files" "3" "cpptools.qbs" "4" "cpptools_dependencies" "2" @@ -5226,10 +5224,6 @@ "remotegdbserveradapter.cpp" "5" "startgdbserverdialog.cpp" "5" "termgdbadapter.cpp" "5" -"Resources" "4" -"gdb.qrc" "5" -"/gdb" "6" -"gdbmacros.txt" "7" "languageutils_dependencies" "3" "languageutils_dependencies.pri" "4" "lldb" "3" @@ -5331,7 +5325,6 @@ "utils_dependencies" "3" "utils_dependencies.pri" "4" "Headers" "3" -"basewindow.h" "4" "breakhandler.h" "4" "breakpoint.h" "4" "breakpointmarker.h" "4" @@ -5358,7 +5351,6 @@ "debuggerrunner.h" "4" "debuggersourcepathmappingwidget.h" "4" "debuggerstartparameters.h" "4" -"debuggerstreamops.h" "4" "debuggerstringutils.h" "4" "debuggertooltipmanager.h" "4" "disassembleragent.h" "4" @@ -5395,7 +5387,6 @@ "watchutils.h" "4" "watchwindow.h" "4" "Sources" "3" -"basewindow.cpp" "4" "breakhandler.cpp" "4" "breakpoint.cpp" "4" "breakpointmarker.cpp" "4" @@ -5416,7 +5407,6 @@ "debuggerrunconfigurationaspect.cpp" "4" "debuggerrunner.cpp" "4" "debuggersourcepathmappingwidget.cpp" "4" -"debuggerstreamops.cpp" "4" "debuggertooltipmanager.cpp" "4" "disassembleragent.cpp" "4" "disassemblerlines.cpp" "4" @@ -5451,8 +5441,6 @@ "watchhandler.cpp" "4" "watchutils.cpp" "4" "watchwindow.cpp" "4" -"Forms" "3" -"localsandexpressionsoptionspage.ui" "4" "Resources" "3" "debugger.qrc" "4" "/debugger" "5" @@ -5463,11 +5451,14 @@ "images/breakpoint_disabled_32.png" "6" "images/breakpoint_pending_16.png" "6" "images/breakpoint_pending_24.png" "6" +"images/category_debug.png" "6" "images/debugger_breakpoints.png" "6" "images/debugger_continue.png" "6" "images/debugger_continue_small.png" "6" "images/debugger_empty_14.png" "6" "images/debugger_interrupt.png" "6" +"images/debugger_restart.png" "6" +"images/debugger_restart_small.png" "6" "images/debugger_reversemode_16.png" "6" "images/debugger_singleinstructionmode.png" "6" "images/debugger_snapshot_small.png" "6" @@ -5482,6 +5473,8 @@ "images/debugger_stop_small.png" "6" "images/location_16.png" "6" "images/location_24.png" "6" +"images/mode_debug.png" "6" +"images/mode_debug@2x.png" "6" "images/pin.xpm" "6" "images/qml/app-on-top.png" "6" "images/qml/apply-on-save.png" "6" @@ -5644,9 +5637,12 @@ "diffeditorguicontroller.h" "4" "diffeditormanager.h" "4" "diffeditorplugin.h" "4" +"diffeditorreloader.h" "4" "differ.h" "4" "diffutils.h" "4" +"selectabletexteditorwidget.h" "4" "sidebysidediffeditorwidget.h" "4" +"unifieddiffeditorwidget.h" "4" "Sources" "3" "diffeditor.cpp" "4" "diffeditorcontroller.cpp" "4" @@ -5655,13 +5651,60 @@ "diffeditorguicontroller.cpp" "4" "diffeditormanager.cpp" "4" "diffeditorplugin.cpp" "4" +"diffeditorreloader.cpp" "4" "differ.cpp" "4" "diffutils.cpp" "4" +"selectabletexteditorwidget.cpp" "4" "sidebysidediffeditorwidget.cpp" "4" +"unifieddiffeditorwidget.cpp" "4" +"Resources" "3" +"diffeditor.qrc" "4" +"/diffeditor" "5" +"images/sidebysidediff.png" "6" +"images/sidebysidediff@2x.png" "6" +"images/topbar.png" "6" +"images/topbar@2x.png" "6" +"images/unifieddiff.png" "6" +"images/unifieddiff@2x.png" "6" "Other files" "3" "diffeditor.qbs" "4" "diffeditor_dependencies" "2" "diffeditor_dependencies.pri" "3" +"emacskeys" "2" +"emacskeys.pro" "3" +"aggregation_dependencies" "3" +"aggregation_dependencies.pri" "4" +"coreplugin_dependencies" "3" +"coreplugin_dependencies.pri" "4" +"emacskeys_dependencies" "3" +"emacskeys_dependencies.pri" "4" +"extensionsystem_dependencies" "3" +"extensionsystem_dependencies.pri" "4" +"qtcreator" "3" +"qtcreator.pri" "4" +"qtcreatorplugin" "3" +"qtcreatorplugin.pri" "4" +"Headers" "4" +"shared" "5" +"qtcreator_gui_pch.h" "6" +"Other files" "4" +"plugins/emacskeys" "5" +"EmacsKeys.pluginspec.in" "6" +"texteditor_dependencies" "3" +"texteditor_dependencies.pri" "4" +"utils_dependencies" "3" +"utils_dependencies.pri" "4" +"Headers" "3" +"emacskeysconstants.h" "4" +"emacskeysplugin.h" "4" +"emacskeysstate.h" "4" +"Sources" "3" +"emacskeysplugin.cpp" "4" +"emacskeysstate.cpp" "4" +"Other files" "3" +"emacskeys.qbs" "4" +"emacskeys_dependencies" "2" +"emacskeys_dependencies.pri" "3" "fakevim" "2" "fakevim.pro" "3" "aggregation_dependencies" "3" @@ -5697,30 +5740,14 @@ "fakevimplugin.cpp" "4" "Forms" "3" "fakevimoptions.ui" "4" +"Resources" "3" +"fakevim.qrc" "4" +"/fakevim" "5" +"images/category_fakevim.png" "6" "Other files" "3" "fakevim.qbs" "4" "fakevim_dependencies" "2" "fakevim_dependencies.pri" "3" -"find" "2" -"find.pro" "3" -"find_dependencies" "3" -"find_dependencies.pri" "4" -"qtcreator" "3" -"qtcreator.pri" "4" -"qtcreatorplugin" "3" -"qtcreatorplugin.pri" "4" -"Headers" "4" -"shared" "5" -"qtcreator_gui_pch.h" "6" -"Other files" "4" -"plugins/find" "5" -"Find.pluginspec.in" "6" -"Sources" "3" -"findplugin.cpp" "4" -"Other files" "3" -"find.qbs" "4" -"find_dependencies" "2" -"find_dependencies.pri" "3" "genericprojectmanager" "2" "genericprojectmanager.pro" "3" "aggregation_dependencies" "3" @@ -5993,7 +6020,6 @@ "glsleditorplugin.h" "4" "glslfilewizard.h" "4" "glslhighlighter.h" "4" -"glslhighlighterfactory.h" "4" "glslhoverhandler.h" "4" "glslindenter.h" "4" "reuse.h" "4" @@ -6006,7 +6032,6 @@ "glsleditorplugin.cpp" "4" "glslfilewizard.cpp" "4" "glslhighlighter.cpp" "4" -"glslhighlighterfactory.cpp" "4" "glslhoverhandler.cpp" "4" "glslindenter.cpp" "4" "reuse.cpp" "4" @@ -6084,6 +6109,8 @@ "topicchooser.ui" "5" "help_dependencies" "3" "help_dependencies.pri" "4" +"projectexplorer_dependencies" "3" +"projectexplorer_dependencies.pri" "4" "qtcreator" "3" "qtcreator.pri" "4" "qtcreatorplugin" "3" @@ -6097,7 +6124,6 @@ "Headers" "3" "centralwidget.h" "4" "docsettingspage.h" "4" -"externalhelpwindow.h" "4" "filtersettingspage.h" "4" "generalsettingspage.h" "4" "helpconstants.h" "4" @@ -6106,19 +6132,22 @@ "helpmode.h" "4" "helpplugin.h" "4" "helpviewer.h" "4" -"helpviewer_p.h" "4" +"helpwidget.h" "4" "localhelpmanager.h" "4" +"macwebkithelpviewer.h" "4" "openpagesmanager.h" "4" "openpagesmodel.h" "4" "openpagesswitcher.h" "4" "openpageswidget.h" "4" +"qtwebkithelpviewer.h" "4" "remotehelpfilter.h" "4" +"searchtaskhandler.h" "4" "searchwidget.h" "4" +"textbrowserhelpviewer.h" "4" "xbelsupport.h" "4" "Sources" "3" "centralwidget.cpp" "4" "docsettingspage.cpp" "4" -"externalhelpwindow.cpp" "4" "filtersettingspage.cpp" "4" "generalsettingspage.cpp" "4" "helpfindsupport.cpp" "4" @@ -6126,15 +6155,17 @@ "helpmode.cpp" "4" "helpplugin.cpp" "4" "helpviewer.cpp" "4" -"helpviewer_qtb.cpp" "4" -"helpviewer_qwv.cpp" "4" +"helpwidget.cpp" "4" "localhelpmanager.cpp" "4" "openpagesmanager.cpp" "4" "openpagesmodel.cpp" "4" "openpagesswitcher.cpp" "4" "openpageswidget.cpp" "4" +"qtwebkithelpviewer.cpp" "4" "remotehelpfilter.cpp" "4" +"searchtaskhandler.cpp" "4" "searchwidget.cpp" "4" +"textbrowserhelpviewer.cpp" "4" "xbelsupport.cpp" "4" "Forms" "3" "docsettingspage.ui" "4" @@ -6146,8 +6177,11 @@ "/help" "5" "images/book.png" "6" "images/bookmark.png" "6" +"images/category_help.png" "6" "images/find.png" "6" "images/home.png" "6" +"images/mode_help.png" "6" +"images/mode_help@2x.png" "6" "images/next.png" "6" "images/previous.png" "6" "/trolltech/assistant" "5" @@ -6332,26 +6366,6 @@ "ios.qbs" "4" "ios_dependencies" "2" "ios_dependencies.pri" "3" -"locator" "2" -"locator.pro" "3" -"locator_dependencies" "3" -"locator_dependencies.pri" "4" -"qtcreator" "3" -"qtcreator.pri" "4" -"qtcreatorplugin" "3" -"qtcreatorplugin.pri" "4" -"Headers" "4" -"shared" "5" -"qtcreator_gui_pch.h" "6" -"Other files" "4" -"plugins/locator" "5" -"Locator.pluginspec.in" "6" -"Sources" "3" -"locatorplugin.cpp" "4" -"Other files" "3" -"locator.qbs" "4" -"locator_dependencies" "2" -"locator_dependencies.pri" "3" "macros" "2" "macros.pro" "3" "aggregation_dependencies" "3" @@ -6642,6 +6656,7 @@ "abiwidget.h" "4" "abstractmsvctoolchain.h" "4" "abstractprocessstep.h" "4" +"addnewmodel.h" "4" "allprojectsfilter.h" "4" "allprojectsfind.h" "4" "ansifilterparser.h" "4" @@ -6663,6 +6678,7 @@ "clangparser.h" "4" "codestylesettingspropertiespage.h" "4" "compileoutputwindow.h" "4" +"configtaskhandler.h" "4" "copytaskhandler.h" "4" "corelistenercheckingforrunningbuild.h" "4" "currentprojectfilter.h" "4" @@ -6675,6 +6691,8 @@ "deployconfiguration.h" "4" "deployconfigurationmodel.h" "4" "deploymentdata.h" "4" +"deploymentdatamodel.h" "4" +"deploymentdataview.h" "4" "doubletabwidget.h" "4" "editorconfiguration.h" "4" "editorsettingspropertiespage.h" "4" @@ -6716,7 +6734,6 @@ "nodesvisitor.h" "4" "osparser.h" "4" "outputparser_test.h" "4" -"pluginfilefactory.h" "4" "processparameters.h" "4" "processstep.h" "4" "project.h" "4" @@ -6763,6 +6780,7 @@ "vcsannotatetaskhandler.h" "4" "wincetoolchain.h" "4" "windebuginterface.h" "4" +"xcodebuildparser.h" "4" "Sources" "3" "devicesupport" "4" "desktopdevice.cpp" "5" @@ -6792,6 +6810,7 @@ "abiwidget.cpp" "4" "abstractmsvctoolchain.cpp" "4" "abstractprocessstep.cpp" "4" +"addnewmodel.cpp" "4" "allprojectsfilter.cpp" "4" "allprojectsfind.cpp" "4" "ansifilterparser.cpp" "4" @@ -6811,6 +6830,7 @@ "clangparser.cpp" "4" "codestylesettingspropertiespage.cpp" "4" "compileoutputwindow.cpp" "4" +"configtaskhandler.cpp" "4" "copytaskhandler.cpp" "4" "corelistenercheckingforrunningbuild.cpp" "4" "currentprojectfilter.cpp" "4" @@ -6822,6 +6842,8 @@ "deployablefile.cpp" "4" "deployconfiguration.cpp" "4" "deployconfigurationmodel.cpp" "4" +"deploymentdatamodel.cpp" "4" +"deploymentdataview.cpp" "4" "doubletabwidget.cpp" "4" "editorconfiguration.cpp" "4" "editorsettingspropertiespage.cpp" "4" @@ -6857,7 +6879,6 @@ "nodesvisitor.cpp" "4" "osparser.cpp" "4" "outputparser_test.cpp" "4" -"pluginfilefactory.cpp" "4" "processparameters.cpp" "4" "processstep.cpp" "4" "project.cpp" "4" @@ -6901,6 +6922,7 @@ "vcsannotatetaskhandler.cpp" "4" "wincetoolchain.cpp" "4" "windebuginterface.cpp" "4" +"xcodebuildparser.cpp" "4" "Forms" "3" "devicesupport" "4" "desktopdeviceconfigurationwidget.ui" "5" @@ -6909,6 +6931,7 @@ "devicetestdialog.ui" "5" "codestylesettingspropertiespage.ui" "4" "customparserconfigdialog.ui" "4" +"deploymentdataview.ui" "4" "doubletabwidget.ui" "4" "editorsettingspropertiespage.ui" "4" "processstep.ui" "4" @@ -6920,30 +6943,35 @@ "projectexplorer.qrc" "4" "/projectexplorer" "5" "images/build.png" "6" +"images/build@2x.png" "6" "images/build_small.png" "6" "images/BuildSettings.png" "6" +"images/category_buildrun.png" "6" "images/clean.png" "6" "images/clean_small.png" "6" "images/closetab.png" "6" "images/CodeStyleSettings.png" "6" -"images/compile_error.png" "6" -"images/compile_warning.png" "6" "images/debugger_start.png" "6" +"images/debugger_start@2x.png" "6" "images/debugger_start_small.png" "6" "images/DeviceConnected.png" "6" "images/DeviceDisconnected.png" "6" "images/DeviceReadyToUse.png" "6" "images/disabledbuildstep.png" "6" +"images/disabledbuildstep@2x.png" "6" "images/EditorSettings.png" "6" "images/leftselection.png" "6" "images/MaemoDevice.png" "6" "images/midselection.png" "6" +"images/mode_project.png" "6" +"images/mode_project@2x.png" "6" "images/ProjectDependencies.png" "6" "images/projectexplorer.png" "6" "images/rebuild.png" "6" "images/rebuild_small.png" "6" "images/rightselection.png" "6" "images/run.png" "6" +"images/run@2x.png" "6" "images/run_small.png" "6" "images/RunSettings.png" "6" "images/session.png" "6" @@ -7020,7 +7048,6 @@ "pythonscanner.h" "6" "sourcecodestream.h" "6" "pythonhighlighter.h" "5" -"pythonhighlighterfactory.h" "5" "pythonindenter.h" "5" "wizard" "4" "pythonclassnamepage.h" "5" @@ -7038,7 +7065,6 @@ "lexical" "5" "pythonscanner.cpp" "6" "pythonhighlighter.cpp" "5" -"pythonhighlighterfactory.cpp" "5" "pythonindenter.cpp" "5" "wizard" "4" "pythonclassnamepage.cpp" "5" @@ -7126,6 +7152,7 @@ "qbsprojectmanager_global.h" "4" "qbsprojectmanagerconstants.h" "4" "qbsprojectmanagerplugin.h" "4" +"qbsprojectparser.h" "4" "qbspropertylineedit.h" "4" "qbsrunconfiguration.h" "4" "Sources" "3" @@ -7143,6 +7170,7 @@ "qbsprojectfile.cpp" "4" "qbsprojectmanager.cpp" "4" "qbsprojectmanagerplugin.cpp" "4" +"qbsprojectparser.cpp" "4" "qbspropertylineedit.cpp" "4" "qbsrunconfiguration.cpp" "4" "Forms" "3" @@ -7240,9 +7268,6 @@ "filespage.h" "5" "guiappwizard.h" "5" "guiappwizarddialog.h" "5" -"html5app.h" "5" -"html5appwizard.h" "5" -"html5appwizardpages.h" "5" "libraryparameters.h" "5" "librarywizard.h" "5" "librarywizarddialog.h" "5" @@ -7267,7 +7292,6 @@ "profileeditor.h" "4" "profileeditorfactory.h" "4" "profilehighlighter.h" "4" -"profilehighlighterfactory.h" "4" "profilehoverhandler.h" "4" "qmakebuildconfiguration.h" "4" "qmakebuildinfo.h" "4" @@ -7296,9 +7320,6 @@ "filespage.cpp" "5" "guiappwizard.cpp" "5" "guiappwizarddialog.cpp" "5" -"html5app.cpp" "5" -"html5appwizard.cpp" "5" -"html5appwizardpages.cpp" "5" "libraryparameters.cpp" "5" "librarywizard.cpp" "5" "librarywizarddialog.cpp" "5" @@ -7323,7 +7344,6 @@ "profileeditor.cpp" "4" "profileeditorfactory.cpp" "4" "profilehighlighter.cpp" "4" -"profilehighlighterfactory.cpp" "4" "profilehoverhandler.cpp" "4" "qmakebuildconfiguration.cpp" "4" "qmakekitconfigwidget.cpp" "4" @@ -7340,7 +7360,6 @@ "qtmodulesinfo.cpp" "4" "Forms" "3" "wizards" "4" -"html5appwizardsourcespage.ui" "5" "testwizardpage.ui" "5" "librarydetailswidget.ui" "4" "makestep.ui" "4" @@ -7360,7 +7379,6 @@ "/wizards" "6" "images/console.png" "7" "images/gui.png" "7" -"images/html5app.png" "7" "images/lib.png" "7" "images/qtquickapp.png" "7" "Other files" "3" @@ -7375,9 +7393,19 @@ "componentsplugin.pri" "5" "Headers" "5" "iwidgetplugin.h" "7" +"addtabdesigneraction.h" "6" +"addtabtotabviewdialog.h" "6" "componentsplugin.h" "6" +"entertabdesigneraction.h" "6" +"tabviewindexmodel.h" "6" "Sources" "5" +"addtabdesigneraction.cpp" "6" +"addtabtotabviewdialog.cpp" "6" "componentsplugin.cpp" "6" +"entertabdesigneraction.cpp" "6" +"tabviewindexmodel.cpp" "6" +"Forms" "5" +"addtabtotabviewdialog.ui" "6" "Resources" "5" "componentsplugin.qrc" "6" "/componentsplugin" "7" @@ -7420,7 +7448,10 @@ "Controls/ButtonSpecifics.qml" "8" "Controls/CheckBoxSpecifics.qml" "8" "Controls/ComboBoxSpecifics.qml" "8" +"Controls/CurrentIndexComboBox.qml" "8" "Controls/RadioButtonSpecifics.qml" "8" +"Controls/TabPositionComboBox.qml" "8" +"Controls/TabViewSpecifics.qml" "8" "Controls/TextAreaSpecifics.qml" "8" "Controls/TextFieldSpecifics.qml" "8" "Other files" "5" @@ -7429,12 +7460,12 @@ "iwidgetplugin.pri" "5" "plugindestdir" "4" "plugindestdir.pri" "5" +"qmldesigner_dependencies" "4" +"qmldesigner_dependencies.pri" "5" "qtcreator" "4" "qtcreator.pri" "5" "qmldesignerplugin" "3" "qmldesignerplugin.pro" "4" -"aggregation_dependencies" "4" -"aggregation_dependencies.pri" "5" "commands" "4" "commands.pri" "5" "Headers" "5" @@ -7455,6 +7486,7 @@ "endpuppetcommand.h" "6" "informationchangedcommand.h" "6" "pixmapchangedcommand.h" "6" +"puppetalivecommand.h" "6" "removeinstancescommand.h" "6" "removepropertiescommand.h" "6" "removesharedmemorycommand.h" "6" @@ -7481,6 +7513,7 @@ "endpuppetcommand.cpp" "6" "informationchangedcommand.cpp" "6" "pixmapchangedcommand.cpp" "6" +"puppetalivecommand.cpp" "6" "removeinstancescommand.cpp" "6" "removepropertiescommand.cpp" "6" "removesharedmemorycommand.cpp" "6" @@ -7492,31 +7525,27 @@ "componentcore" "4" "componentcore.pri" "5" "Headers" "5" -"abstractdesigneraction.h" "6" -"addtabtotabviewdialog.h" "6" +"abstractaction.h" "6" +"abstractactiongroup.h" "6" +"actioninterface.h" "6" "componentcore_constants.h" "6" "crumblebar.h" "6" -"defaultdesigneraction.h" "6" "designeractionmanager.h" "6" "designeractionmanagerview.h" "6" "modelnodecontextmenu.h" "6" "modelnodecontextmenu_helper.h" "6" "modelnodeoperations.h" "6" "selectioncontext.h" "6" -"tabviewdesigneraction.h" "6" "Sources" "5" -"addtabtotabviewdialog.cpp" "6" +"abstractaction.cpp" "6" +"abstractactiongroup.cpp" "6" "crumblebar.cpp" "6" -"defaultdesigneraction.cpp" "6" "designeractionmanager.cpp" "6" "designeractionmanagerview.cpp" "6" "modelnodecontextmenu.cpp" "6" "modelnodecontextmenu_helper.cpp" "6" "modelnodeoperations.cpp" "6" "selectioncontext.cpp" "6" -"tabviewdesigneraction.cpp" "6" -"Forms" "5" -"addtabtotabviewdialog.ui" "6" "config" "4" "config.pri" "5" "container" "4" @@ -7531,6 +7560,7 @@ "propertybindingcontainer.h" "6" "propertyvaluecontainer.h" "6" "reparentcontainer.h" "6" +"sharedmemory.h" "6" "Sources" "5" "addimportcontainer.cpp" "6" "idcontainer.cpp" "6" @@ -7541,12 +7571,10 @@ "propertybindingcontainer.cpp" "6" "propertyvaluecontainer.cpp" "6" "reparentcontainer.cpp" "6" +"sharedmemory_qt.cpp" "6" +"sharedmemory_unix.cpp" "6" "coreplugin_dependencies" "4" "coreplugin_dependencies.pri" "5" -"cplusplus_dependencies" "4" -"cplusplus_dependencies.pri" "5" -"cpptools_dependencies" "4" -"cpptools_dependencies.pri" "5" "debugview" "4" "debugview.pri" "5" "Headers" "5" @@ -7563,6 +7591,7 @@ "include" "6" "abstractproperty.h" "7" "abstractview.h" "7" +"anchorline.h" "7" "basetexteditmodifier.h" "7" "bindingproperty.h" "7" "componenttextmodifier.h" "7" @@ -7626,7 +7655,6 @@ "model_p.h" "7" "modelnodepositionrecalculator.h" "7" "modeltotextmerger.h" "7" -"painteventfilter_p.h" "7" "qmltextgenerator.h" "7" "rewriteaction.h" "7" "rewriteactioncompressor.h" "7" @@ -7661,6 +7689,7 @@ "model" "6" "abstractproperty.cpp" "7" "abstractview.cpp" "7" +"anchorline.cpp" "7" "basetexteditmodifier.cpp" "7" "bindingproperty.cpp" "7" "componenttextmodifier.cpp" "7" @@ -7682,7 +7711,6 @@ "nodeabstractproperty.cpp" "7" "nodelistproperty.cpp" "7" "nodeproperty.cpp" "7" -"painteventfilter.cpp" "7" "plaintexteditmodifier.cpp" "7" "propertycontainer.cpp" "7" "propertynode.cpp" "7" @@ -7709,8 +7737,6 @@ "Forms" "5" "instances" "6" "puppetdialog.ui" "7" -"extensionsystem_dependencies" "4" -"extensionsystem_dependencies.pri" "5" "filemanager" "4" "filemanager.pri" "5" "Headers" "5" @@ -7863,10 +7889,16 @@ "Headers" "5" "nodeinstance.h" "7" "nodeinstanceserverproxy.h" "6" +"puppetbuildprogressdialog.h" "6" +"puppetcreator.h" "6" "Sources" "5" "nodeinstance.cpp" "6" "nodeinstanceserverproxy.cpp" "6" "nodeinstanceview.cpp" "6" +"puppetbuildprogressdialog.cpp" "6" +"puppetcreator.cpp" "6" +"Forms" "5" +"puppetbuildprogressdialog.ui" "6" "integration" "4" "integration.pri" "5" "Headers" "5" @@ -7897,45 +7929,42 @@ "itemlibrary" "4" "itemlibrary.pri" "5" "Headers" "5" -"customdraganddrop.h" "6" -"itemlibrarycomponents.h" "6" "itemlibraryimageprovider.h" "6" +"itemlibraryitem.h" "6" "itemlibrarymodel.h" "6" +"itemlibrarysection.h" "6" +"itemlibrarysectionmodel.h" "6" +"itemlibrarytreeview.h" "6" "itemlibraryview.h" "6" "itemlibrarywidget.h" "6" +"resourceitemdelegate.h" "6" "Sources" "5" -"customdraganddrop.cpp" "6" -"itemlibrarycomponents.cpp" "6" "itemlibraryimageprovider.cpp" "6" +"itemlibraryitem.cpp" "6" "itemlibrarymodel.cpp" "6" +"itemlibrarysection.cpp" "6" +"itemlibrarysectionmodel.cpp" "6" +"itemlibrarytreeview.cpp" "6" "itemlibraryview.cpp" "6" "itemlibrarywidget.cpp" "6" +"resourceitemdelegate.cpp" "6" "Resources" "5" "itemlibrary.qrc" "6" "/ItemLibrary" "7" "images/item-default-icon.png" "8" "images/item-invalid-icon.png" "8" -"qml/ItemsView.qml" "8" -"qml/ItemsViewStyle.qml" "8" -"qml/SectionView.qml" "8" -"qml/Selector.qml" "8" -"qml/SingleItemView.qml" "8" -"QML" "5" -"qml" "6" -"ItemsView.qml" "7" -"ItemsViewStyle.qml" "7" -"SectionView.qml" "7" -"Selector.qml" "7" -"languageutils_dependencies" "4" -"languageutils_dependencies.pri" "5" "navigator" "4" "navigator.pri" "5" "Headers" "5" +"iconcheckboxitemdelegate.h" "6" +"nameitemdelegate.h" "6" "navigatortreemodel.h" "6" "navigatortreeview.h" "6" "navigatorview.h" "6" "navigatorwidget.h" "6" "Sources" "5" +"iconcheckboxitemdelegate.cpp" "6" +"nameitemdelegate.cpp" "6" "navigatortreemodel.cpp" "6" "navigatortreeview.cpp" "6" "navigatorview.cpp" "6" @@ -7972,6 +8001,7 @@ "propertyeditorview.h" "6" "propertyeditorwidget.h" "6" "qmlanchorbindingproxy.h" "6" +"qmlmodelnodeproxy.h" "6" "quick2propertyeditorview.h" "6" "Sources" "5" "designerpropertymap.cpp" "6" @@ -7984,6 +8014,7 @@ "propertyeditorview.cpp" "6" "propertyeditorwidget.cpp" "6" "qmlanchorbindingproxy.cpp" "6" +"qmlmodelnodeproxy.cpp" "6" "quick2propertyeditorview.cpp" "6" "Resources" "5" "propertyeditor.qrc" "6" @@ -8007,6 +8038,7 @@ "documentmanager.h" "6" "qmldesignerconstants.h" "6" "qmldesignerplugin.h" "6" +"qmldesignerwarning.h" "6" "settingspage.h" "6" "shortcutmanager.h" "6" "styledoutputpaneplaceholder.h" "6" @@ -8016,19 +8048,14 @@ "designmodewidget.cpp" "6" "documentmanager.cpp" "6" "qmldesignerplugin.cpp" "6" +"qmldesignerwarning.cpp" "6" "settingspage.cpp" "6" "shortcutmanager.cpp" "6" "styledoutputpaneplaceholder.cpp" "6" "Forms" "5" "settingspage.ui" "6" -"qmleditorwidgets_dependencies" "4" -"qmleditorwidgets_dependencies.pri" "5" -"qmljs_dependencies" "4" -"qmljs_dependencies.pri" "5" "qmljseditor_dependencies" "4" "qmljseditor_dependencies.pri" "5" -"qmljstools_dependencies" "4" -"qmljstools_dependencies.pri" "5" "qtcreator" "4" "qtcreator.pri" "5" "qtcreatorplugin" "4" @@ -8051,8 +8078,6 @@ "scrollbar.css" "8" "stylesheet.css" "8" "templates/Standard/Form.xml" "8" -"ssh_dependencies" "4" -"ssh_dependencies.pri" "5" "stateseditor" "4" "stateseditor.pri" "5" "Headers" "5" @@ -8065,14 +8090,6 @@ "stateseditormodel.cpp" "6" "stateseditorview.cpp" "6" "stateseditorwidget.cpp" "6" -"Resources" "5" -"stateseditor.qrc" "6" -"/stateseditor" "7" -"HorizontalScrollBar.qml" "8" -"stateslist.qml" "8" -"QML" "5" -"HorizontalScrollBar.qml" "6" -"stateslist.qml" "6" "texteditor_dependencies" "4" "texteditor_dependencies.pri" "5" "types" "4" @@ -8081,8 +8098,6 @@ "enumeration.h" "6" "Sources" "5" "enumeration.cpp" "6" -"utils_dependencies" "4" -"utils_dependencies.pri" "5" "qtquickplugin" "3" "qtquickplugin.pro" "4" "iwidgetplugin" "4" @@ -8208,7 +8223,6 @@ "qmljseditorplugin.h" "4" "qmljsfindreferences.h" "4" "qmljshighlighter.h" "4" -"qmljshighlighterfactory.h" "4" "qmljshoverhandler.h" "4" "qmljsoutline.h" "4" "qmljsoutlinetreeview.h" "4" @@ -8239,7 +8253,6 @@ "qmljseditorplugin.cpp" "4" "qmljsfindreferences.cpp" "4" "qmljshighlighter.cpp" "4" -"qmljshighlighterfactory.cpp" "4" "qmljshoverhandler.cpp" "4" "qmljsoutline.cpp" "4" "qmljsoutlinetreeview.cpp" "4" @@ -8357,12 +8370,10 @@ "Resources" "3" "qmljstools.qrc" "4" "/qmljstools" "5" +"images/category_qml.png" "6" "images/collapse.png" "6" -"images/error.png" "6" "images/expand.png" "6" -"images/log.png" "6" "images/prompt.png" "6" -"images/warning.png" "6" "QmlJSTools.mimetypes.xml" "6" "Other files" "3" "QmlJSTools.mimetypes.xml" "4" @@ -8441,8 +8452,6 @@ "qmlprofilerviewmanager.h" "4" "qv8profilerdatamodel.h" "4" "qv8profilereventview.h" "4" -"singlecategorytimelinemodel.h" "4" -"singlecategorytimelinemodel_p.h" "4" "sortedtimelinemodel.h" "4" "timelinemodelaggregator.h" "4" "timelinerenderer.h" "4" @@ -8471,7 +8480,6 @@ "qmlprofilerviewmanager.cpp" "4" "qv8profilerdatamodel.cpp" "4" "qv8profilereventview.cpp" "4" -"singlecategorytimelinemodel.cpp" "4" "sortedtimelinemodel.cpp" "4" "timelinemodelaggregator.cpp" "4" "timelinerenderer.cpp" "4" @@ -8481,6 +8489,7 @@ "/qmlprofiler" "6" "arrow_down.png" "7" "arrow_right.png" "7" +"ButtonsBar.qml" "7" "CategoryLabel.qml" "7" "clean_pane_small.png" "7" "Detail.qml" "7" @@ -8507,6 +8516,7 @@ "TimeMarks.qml" "7" "QML" "3" "qml" "4" +"ButtonsBar.qml" "5" "CategoryLabel.qml" "5" "Detail.qml" "5" "MainView.qml" "5" @@ -8705,6 +8715,8 @@ "bardescriptoreditorpackageinformationwidget.h" "4" "bardescriptoreditorpermissionswidget.h" "4" "bardescriptoreditorwidget.h" "4" +"bardescriptorfilenode.h" "4" +"bardescriptorfilenodemanager.h" "4" "bardescriptormagicmatcher.h" "4" "bardescriptorpermissionsmodel.h" "4" "blackberryabstractdeploystep.h" "4" @@ -8729,7 +8741,6 @@ "blackberrydeployconfigurationfactory.h" "4" "blackberrydeployconfigurationwidget.h" "4" "blackberrydeployinformation.h" "4" -"blackberrydeployqtlibrariesdialog.h" "4" "blackberrydeploystep.h" "4" "blackberrydeploystepconfigwidget.h" "4" "blackberrydeploystepfactory.h" "4" @@ -8766,18 +8777,21 @@ "blackberrysigningpasswordsdialog.h" "4" "blackberrysigningutils.h" "4" "blackberrysshkeysgenerator.h" "4" -"blackberryversionnumber.h" "4" "pathchooserdelegate.h" "4" "qnxabstractqtversion.h" "4" "qnxabstractrunsupport.h" "4" "qnxanalyzesupport.h" "4" "qnxattachdebugdialog.h" "4" "qnxattachdebugsupport.h" "4" +"qnxbaseconfiguration.h" "4" "qnxbaseqtconfigwidget.h" "4" +"qnxconfiguration.h" "4" +"qnxconfigurationmanager.h" "4" "qnxconstants.h" "4" "qnxdebugsupport.h" "4" "qnxdeployconfiguration.h" "4" "qnxdeployconfigurationfactory.h" "4" +"qnxdeployqtlibrariesdialog.h" "4" "qnxdeploystepfactory.h" "4" "qnxdeviceconfiguration.h" "4" "qnxdeviceconfigurationfactory.h" "4" @@ -8793,8 +8807,11 @@ "qnxrunconfigurationfactory.h" "4" "qnxruncontrol.h" "4" "qnxruncontrolfactory.h" "4" +"qnxsettingspage.h" "4" +"qnxsettingswidget.h" "4" "qnxtoolchain.h" "4" "qnxutils.h" "4" +"qnxversionnumber.h" "4" "slog2inforunner.h" "4" "Sources" "3" "bardescriptordocument.cpp" "4" @@ -8809,6 +8826,8 @@ "bardescriptoreditorpackageinformationwidget.cpp" "4" "bardescriptoreditorpermissionswidget.cpp" "4" "bardescriptoreditorwidget.cpp" "4" +"bardescriptorfilenode.cpp" "4" +"bardescriptorfilenodemanager.cpp" "4" "bardescriptormagicmatcher.cpp" "4" "bardescriptorpermissionsmodel.cpp" "4" "blackberryabstractdeploystep.cpp" "4" @@ -8833,7 +8852,6 @@ "blackberrydeployconfigurationfactory.cpp" "4" "blackberrydeployconfigurationwidget.cpp" "4" "blackberrydeployinformation.cpp" "4" -"blackberrydeployqtlibrariesdialog.cpp" "4" "blackberrydeploystep.cpp" "4" "blackberrydeploystepconfigwidget.cpp" "4" "blackberrydeploystepfactory.cpp" "4" @@ -8870,17 +8888,20 @@ "blackberrysigningpasswordsdialog.cpp" "4" "blackberrysigningutils.cpp" "4" "blackberrysshkeysgenerator.cpp" "4" -"blackberryversionnumber.cpp" "4" "pathchooserdelegate.cpp" "4" "qnxabstractqtversion.cpp" "4" "qnxabstractrunsupport.cpp" "4" "qnxanalyzesupport.cpp" "4" "qnxattachdebugdialog.cpp" "4" "qnxattachdebugsupport.cpp" "4" +"qnxbaseconfiguration.cpp" "4" "qnxbaseqtconfigwidget.cpp" "4" +"qnxconfiguration.cpp" "4" +"qnxconfigurationmanager.cpp" "4" "qnxdebugsupport.cpp" "4" "qnxdeployconfiguration.cpp" "4" "qnxdeployconfigurationfactory.cpp" "4" +"qnxdeployqtlibrariesdialog.cpp" "4" "qnxdeploystepfactory.cpp" "4" "qnxdeviceconfiguration.cpp" "4" "qnxdeviceconfigurationfactory.cpp" "4" @@ -8896,8 +8917,11 @@ "qnxrunconfigurationfactory.cpp" "4" "qnxruncontrol.cpp" "4" "qnxruncontrolfactory.cpp" "4" +"qnxsettingspage.cpp" "4" +"qnxsettingswidget.cpp" "4" "qnxtoolchain.cpp" "4" "qnxutils.cpp" "4" +"qnxversionnumber.cpp" "4" "slog2inforunner.cpp" "4" "Forms" "3" "bardescriptoreditorassetswidget.ui" "4" @@ -8913,7 +8937,6 @@ "blackberrydebugtokenpinsdialog.ui" "4" "blackberrydebugtokenrequestdialog.ui" "4" "blackberrydeployconfigurationwidget.ui" "4" -"blackberrydeployqtlibrariesdialog.ui" "4" "blackberrydeviceconfigurationwidget.ui" "4" "blackberrydeviceconfigurationwizardconfigpage.ui" "4" "blackberrydeviceconfigurationwizardquerypage.ui" "4" @@ -8928,15 +8951,16 @@ "blackberryrunconfigurationwidget.ui" "4" "blackberrysigningpasswordsdialog.ui" "4" "qnxbaseqtconfigwidget.ui" "4" +"qnxdeployqtlibrariesdialog.ui" "4" +"qnxsettingswidget.ui" "4" "Resources" "3" "qnx.qrc" "4" +"/" "5" "/qnx" "5" -"images/error.png" "6" -"images/info.png" "6" "images/ok.png" "6" +"images/qnx-target.png" "6" "images/target-small.png" "6" "images/target.png" "6" -"images/warning.png" "6" "Other files" "3" "qnx.qbs" "4" "qnx_dependencies" "2" @@ -9137,6 +9161,7 @@ "abstractpackagingstep.h" "4" "abstractremotelinuxdeployservice.h" "4" "abstractremotelinuxdeploystep.h" "4" +"abstractremotelinuxrunconfiguration.h" "4" "abstractremotelinuxrunsupport.h" "4" "abstractuploadandinstallpackageservice.h" "4" "embeddedlinuxqtversion.h" "4" @@ -9160,11 +9185,10 @@ "remotelinuxcheckforfreediskspacestep.h" "4" "remotelinuxcustomcommanddeploymentstep.h" "4" "remotelinuxcustomcommanddeployservice.h" "4" +"remotelinuxcustomrunconfiguration.h" "4" "remotelinuxdebugsupport.h" "4" "remotelinuxdeployconfiguration.h" "4" "remotelinuxdeployconfigurationfactory.h" "4" -"remotelinuxdeployconfigurationwidget.h" "4" -"remotelinuxdeploymentdatamodel.h" "4" "remotelinuxenvironmentaspect.h" "4" "remotelinuxenvironmentaspectwidget.h" "4" "remotelinuxenvironmentreader.h" "4" @@ -9185,6 +9209,7 @@ "abstractpackagingstep.cpp" "4" "abstractremotelinuxdeployservice.cpp" "4" "abstractremotelinuxdeploystep.cpp" "4" +"abstractremotelinuxrunconfiguration.cpp" "4" "abstractremotelinuxrunsupport.cpp" "4" "abstractuploadandinstallpackageservice.cpp" "4" "embeddedlinuxqtversion.cpp" "4" @@ -9206,11 +9231,10 @@ "remotelinuxcheckforfreediskspacestep.cpp" "4" "remotelinuxcustomcommanddeploymentstep.cpp" "4" "remotelinuxcustomcommanddeployservice.cpp" "4" +"remotelinuxcustomrunconfiguration.cpp" "4" "remotelinuxdebugsupport.cpp" "4" "remotelinuxdeployconfiguration.cpp" "4" "remotelinuxdeployconfigurationfactory.cpp" "4" -"remotelinuxdeployconfigurationwidget.cpp" "4" -"remotelinuxdeploymentdatamodel.cpp" "4" "remotelinuxenvironmentaspect.cpp" "4" "remotelinuxenvironmentaspectwidget.cpp" "4" "remotelinuxenvironmentreader.cpp" "4" @@ -9231,7 +9255,7 @@ "genericlinuxdeviceconfigurationwidget.ui" "4" "genericlinuxdeviceconfigurationwizardsetuppage.ui" "4" "remotelinuxcheckforfreediskspacestepwidget.ui" "4" -"remotelinuxdeployconfigurationwidget.ui" "4" +"remotelinuxcustomrunconfigurationwidget.ui" "4" "Resources" "3" "remotelinux.qrc" "4" "/remotelinux" "5" @@ -9410,13 +9434,11 @@ "Headers" "3" "stopmonitoringhandler.h" "4" "taskfile.h" "4" -"taskfilefactory.h" "4" "tasklistconstants.h" "4" "tasklistplugin.h" "4" "Sources" "3" "stopmonitoringhandler.cpp" "4" "taskfile.cpp" "4" -"taskfilefactory.cpp" "4" "tasklistplugin.cpp" "4" "Resources" "3" "tasklist.qrc" "4" @@ -9536,10 +9558,10 @@ "fontsettings.h" "4" "fontsettingspage.h" "4" "helpitem.h" "4" +"highlighterfactory.h" "4" "highlighterutils.h" "4" "icodestylepreferences.h" "4" "icodestylepreferencesfactory.h" "4" -"ihighlighterfactory.h" "4" "indenter.h" "4" "ioutlinewidget.h" "4" "itexteditor.h" "4" @@ -9779,7 +9801,6 @@ "Resources" "3" "todoplugin.qrc" "4" "/todoplugin" "5" -"images/info.png" "6" "images/todo.png" "6" "Other files" "3" "todo.qbs" "4" @@ -10023,11 +10044,11 @@ "Headers" "3" "baseannotationhighlighter.h" "4" "basecheckoutwizard.h" "4" +"basecheckoutwizardfactory.h" "4" "basecheckoutwizardpage.h" "4" "basevcseditorfactory.h" "4" "basevcssubmiteditorfactory.h" "4" "checkoutprogresswizardpage.h" "4" -"checkoutwizarddialog.h" "4" "cleandialog.h" "4" "command.h" "4" "commonsettingspage.h" "4" @@ -10054,11 +10075,11 @@ "Sources" "3" "baseannotationhighlighter.cpp" "4" "basecheckoutwizard.cpp" "4" +"basecheckoutwizardfactory.cpp" "4" "basecheckoutwizardpage.cpp" "4" "basevcseditorfactory.cpp" "4" "basevcssubmiteditorfactory.cpp" "4" "checkoutprogresswizardpage.cpp" "4" -"checkoutwizarddialog.cpp" "4" "cleandialog.cpp" "4" "command.cpp" "4" "commonsettingspage.cpp" "4" @@ -10089,6 +10110,7 @@ "Resources" "3" "vcsbase.qrc" "4" "/vcsbase" "5" +"images/category_vcs.png" "6" "images/diff.png" "6" "images/removesubmitfield.png" "6" "images/submit.png" "6" @@ -10137,14 +10159,22 @@ "cplusplus_dependencies.pri" "4" "cpptools_dependencies" "3" "cpptools_dependencies.pri" "4" +"debugger_dependencies" "3" +"debugger_dependencies.pri" "4" "extensionsystem_dependencies" "3" "extensionsystem_dependencies.pri" "4" "languageutils_dependencies" "3" "languageutils_dependencies.pri" "4" "projectexplorer_dependencies" "3" "projectexplorer_dependencies.pri" "4" +"qmakeprojectmanager_dependencies" "3" +"qmakeprojectmanager_dependencies.pri" "4" +"qmldebug_dependencies" "3" +"qmldebug_dependencies.pri" "4" "qmljs_dependencies" "3" "qmljs_dependencies.pri" "4" +"qmljstools_dependencies" "3" +"qmljstools_dependencies.pri" "4" "qtcreator" "3" "qtcreator.pri" "4" "qtcreatorplugin" "3" @@ -10157,6 +10187,8 @@ "WinRt.pluginspec.in" "6" "qtsupport_dependencies" "3" "qtsupport_dependencies.pri" "4" +"resourceeditor_dependencies" "3" +"resourceeditor_dependencies.pri" "4" "ssh_dependencies" "3" "ssh_dependencies.pri" "4" "texteditor_dependencies" "3" @@ -10167,6 +10199,7 @@ "winrt_dependencies.pri" "4" "Headers" "3" "winrtconstants.h" "4" +"winrtdebugsupport.h" "4" "winrtdeployconfiguration.h" "4" "winrtdevice.h" "4" "winrtdevicefactory.h" "4" @@ -10180,7 +10213,9 @@ "winrtrunconfigurationwidget.h" "4" "winrtruncontrol.h" "4" "winrtrunfactories.h" "4" +"winrtrunnerhelper.h" "4" "Sources" "3" +"winrtdebugsupport.cpp" "4" "winrtdeployconfiguration.cpp" "4" "winrtdevice.cpp" "4" "winrtdevicefactory.cpp" "4" @@ -10194,6 +10229,7 @@ "winrtrunconfigurationwidget.cpp" "4" "winrtruncontrol.cpp" "4" "winrtrunfactories.cpp" "4" +"winrtrunnerhelper.cpp" "4" "Forms" "3" "winrtpackagedeploymentstepwidget.ui" "4" "winrtrunconfigurationwidget.ui" "4" @@ -10203,6 +10239,245 @@ "winrt_dependencies.pri" "3" "Other files" "2" "plugins.qbs" "3" +"qtcreator" "1" +"qtcreator.pri" "2" +"qtprofilesetup" "1" +"qtprofilesetup.pro" "2" +"library" "2" +"library.pri" "3" +"library_dirname" "2" +"library_dirname.pri" "3" +"qbs_version" "2" +"qbs_version.pri" "3" +"use_corelib" "2" +"use_corelib.pri" "3" +"Headers" "2" +"qtenvironment.h" "3" +"qtmoduleinfo.h" "3" +"qtprofilesetup.h" "3" +"Sources" "2" +"qtmoduleinfo.cpp" "3" +"qtprofilesetup.cpp" "3" +"Resources" "2" +"templates.qrc" "3" +"/" "4" +"templates/core.qbs" "5" +"templates/gui.qbs" "5" +"templates/moc.js" "5" +"templates/module.qbs" "5" +"templates/phonon.qbs" "5" +"templates/plugin.qbs" "5" +"templates/QtModule.qbs" "5" +"templates/QtPlugin.qbs" "5" +"Other files" "2" +"templates" "3" +"core.qbs" "4" +"gui.qbs" "4" +"moc.js" "4" +"module.qbs" "4" +"phonon.qbs" "4" +"plugin.qbs" "4" +"QtModule.qbs" "4" +"QtPlugin.qbs" "4" +"static" "1" +"static.pro" "2" +"Sources" "2" +"bin" "3" +"ibmsvc.xml" "4" +"ibqbs.bat" "4" +"share/qbs" "3" +"imports/qbs" "4" +"base" "5" +"Application.qbs" "6" +"CppApplication.qbs" "6" +"DynamicLibrary.qbs" "6" +"NodeJSApplication.qbs" "6" +"NSISSetup.qbs" "6" +"QtApplication.qbs" "6" +"QtGuiApplication.qbs" "6" +"StaticLibrary.qbs" "6" +"WindowsInstallerPackage.qbs" "6" +"WindowsSetupPackage.qbs" "6" +"BundleTools" "5" +"bundle-tools.js" "6" +"DarwinTools" "5" +"darwin-tools.js" "6" +"FileInfo" "5" +"fileinfo.js" "6" +"ModUtils" "5" +"utils.js" "6" +"PathTools" "5" +"path-tools.js" "6" +"Probes" "5" +"BinaryProbe.qbs" "6" +"FrameworkProbe.qbs" "6" +"IncludeProbe.qbs" "6" +"PathProbe.qbs" "6" +"PkgConfigProbe.qbs" "6" +"UnixUtils" "5" +"unix-utils.js" "6" +"WindowsUtils" "5" +"windows-utils.js" "6" +"modules" "4" +"cpp" "5" +"CppModule.qbs" "6" +"DarwinGCC.qbs" "6" +"gcc.js" "6" +"GenericGCC.qbs" "6" +"genericunix-gcc.qbs" "6" +"ios-gcc.qbs" "6" +"linux-gcc.qbs" "6" +"msvc.js" "6" +"osx-gcc.qbs" "6" +"UnixGCC.qbs" "6" +"windows-mingw.qbs" "6" +"windows-msvc.qbs" "6" +"ib" "5" +"ib.js" "6" +"IBModule.qbs" "6" +"nodejs" "5" +"NodeJS.qbs" "6" +"nsis" "5" +"NSISModule.qbs" "6" +"qbs" "5" +"common.qbs" "6" +"typescript" "5" +"TypeScriptModule.qbs" "6" +"wix" "5" +"WiXModule.qbs" "6" +"Other files" "2" +"bin" "3" +"ibmsvc.xml" "4" +"ibqbs.bat" "4" +"examples" "3" +"app-and-lib" "4" +"app" "5" +"app.qbs" "6" +"main.cpp" "6" +"lib" "5" +"lib.cpp" "6" +"lib.qbs" "6" +"app_and_lib.qbs" "5" +"cocoa-application" "4" +"CocoaApplication" "5" +"en.lproj" "6" +"Credits.rtf" "7" +"InfoPlist.strings" "7" +"MainMenu.xib" "7" +"AppDelegate.h" "6" +"AppDelegate.m" "6" +"CocoaApplication-Info.plist" "6" +"CocoaApplication-Prefix.pch" "6" +"main.m" "6" +"CocoaApplication.xcodeproj" "5" +"project.pbxproj" "6" +"CocoaApplication.qbs" "5" +"cocoa-touch-application" "4" +"CocoaTouchApplication" "5" +"en.lproj" "6" +"DetailViewController_iPad.xib" "7" +"DetailViewController_iPhone.xib" "7" +"InfoPlist.strings" "7" +"MasterViewController_iPad.xib" "7" +"MasterViewController_iPhone.xib" "7" +"AppDelegate.h" "6" +"AppDelegate.m" "6" +"CocoaTouchApplication-Info.plist" "6" +"CocoaTouchApplication-Prefix.pch" "6" +"Default-568h@2x.png" "6" +"Default.png" "6" +"Default@2x.png" "6" +"DetailViewController.h" "6" +"DetailViewController.m" "6" +"main.m" "6" +"MasterViewController.h" "6" +"MasterViewController.m" "6" +"CocoaTouchApplication.xcodeproj" "5" +"project.pbxproj" "6" +"CocoaTouchApplication.qbs" "5" +"collidingmice" "4" +"images" "5" +"cheese.jpg" "6" +"collidingmice.qbs" "5" +"main.cpp" "5" +"mice.qrc" "5" +"mouse.cpp" "5" +"mouse.h" "5" +"helloworld-complex" "4" +"src" "5" +"foo.cpp" "6" +"foo.h" "6" +"main.cpp" "6" +"specialfeature.cpp" "6" +"specialfeature.h" "6" +"hello.qbs" "5" +"helloworld-minimal" "4" +"hello.qbs" "5" +"main.cpp" "5" +"helloworld-qt" "4" +"hello.qbs" "5" +"main.cpp" "5" +"examples.qbs" "4" +"share/qbs" "3" +"imports/qbs" "4" +"base" "5" +"Application.qbs" "6" +"CppApplication.qbs" "6" +"DynamicLibrary.qbs" "6" +"NodeJSApplication.qbs" "6" +"NSISSetup.qbs" "6" +"QtApplication.qbs" "6" +"QtGuiApplication.qbs" "6" +"StaticLibrary.qbs" "6" +"WindowsInstallerPackage.qbs" "6" +"WindowsSetupPackage.qbs" "6" +"BundleTools" "5" +"bundle-tools.js" "6" +"DarwinTools" "5" +"darwin-tools.js" "6" +"FileInfo" "5" +"fileinfo.js" "6" +"ModUtils" "5" +"utils.js" "6" +"PathTools" "5" +"path-tools.js" "6" +"Probes" "5" +"BinaryProbe.qbs" "6" +"FrameworkProbe.qbs" "6" +"IncludeProbe.qbs" "6" +"PathProbe.qbs" "6" +"PkgConfigProbe.qbs" "6" +"UnixUtils" "5" +"unix-utils.js" "6" +"WindowsUtils" "5" +"windows-utils.js" "6" +"modules" "4" +"cpp" "5" +"CppModule.qbs" "6" +"DarwinGCC.qbs" "6" +"gcc.js" "6" +"GenericGCC.qbs" "6" +"genericunix-gcc.qbs" "6" +"ios-gcc.qbs" "6" +"linux-gcc.qbs" "6" +"msvc.js" "6" +"osx-gcc.qbs" "6" +"UnixGCC.qbs" "6" +"windows-mingw.qbs" "6" +"windows-msvc.qbs" "6" +"ib" "5" +"ib.js" "6" +"IBModule.qbs" "6" +"nodejs" "5" +"NodeJS.qbs" "6" +"nsis" "5" +"NSISModule.qbs" "6" +"qbs" "5" +"common.qbs" "6" +"typescript" "5" +"TypeScriptModule.qbs" "6" +"wix" "5" +"WiXModule.qbs" "6" "tools" "1" "tools.pro" "2" "3rdparty" "2" @@ -10290,6 +10565,8 @@ "frontend.pro" "3" "aggregation_dependencies" "3" "aggregation_dependencies.pri" "4" +"coreplugin_dependencies" "3" +"coreplugin_dependencies.pri" "4" "extensionsystem_dependencies" "3" "extensionsystem_dependencies.pri" "4" "qtcreator" "3" @@ -10354,6 +10631,7 @@ "endpuppetcommand.h" "6" "informationchangedcommand.h" "6" "pixmapchangedcommand.h" "6" +"puppetalivecommand.h" "6" "removeinstancescommand.h" "6" "removepropertiescommand.h" "6" "removesharedmemorycommand.h" "6" @@ -10380,6 +10658,7 @@ "endpuppetcommand.cpp" "6" "informationchangedcommand.cpp" "6" "pixmapchangedcommand.cpp" "6" +"puppetalivecommand.cpp" "6" "removeinstancescommand.cpp" "6" "removepropertiescommand.cpp" "6" "removesharedmemorycommand.cpp" "6" @@ -10400,6 +10679,7 @@ "propertybindingcontainer.h" "6" "propertyvaluecontainer.h" "6" "reparentcontainer.h" "6" +"sharedmemory.h" "6" "Sources" "5" "addimportcontainer.cpp" "6" "idcontainer.cpp" "6" @@ -10410,6 +10690,8 @@ "propertybindingcontainer.cpp" "6" "propertyvaluecontainer.cpp" "6" "reparentcontainer.cpp" "6" +"sharedmemory_qt.cpp" "6" +"sharedmemory_unix.cpp" "6" "instances" "4" "instances.pri" "5" "Headers" "5" @@ -10425,7 +10707,6 @@ "componentnodeinstance.h" "6" "dummycontextobject.h" "6" "dummynodeinstance.h" "6" -"graphicalnodeinstance.h" "6" "layoutnodeinstance.h" "6" "nodeinstancemetaobject.h" "6" "nodeinstanceserver.h" "6" @@ -10442,7 +10723,6 @@ "qt5rendernodeinstanceserver.h" "6" "qt5testnodeinstanceserver.h" "6" "quickitemnodeinstance.h" "6" -"quickwindownodeinstance.h" "6" "servernodeinstance.h" "6" "Sources" "5" "anchorchangesnodeinstance.cpp" "6" @@ -10451,7 +10731,6 @@ "componentnodeinstance.cpp" "6" "dummycontextobject.cpp" "6" "dummynodeinstance.cpp" "6" -"graphicalnodeinstance.cpp" "6" "layoutnodeinstance.cpp" "6" "nodeinstancemetaobject.cpp" "6" "nodeinstanceserver.cpp" "6" @@ -10468,7 +10747,6 @@ "qt5rendernodeinstanceserver.cpp" "6" "qt5testnodeinstanceserver.cpp" "6" "quickitemnodeinstance.cpp" "6" -"quickwindownodeinstance.cpp" "6" "servernodeinstance.cpp" "6" "interfaces" "4" "interfaces.pri" "5" @@ -10489,6 +10767,7 @@ "html/welcome.html" "9" "images/template_image.png" "9" "images/webkit.png" "9" +"mockfiles/Window.qml" "9" "qtcreator" "4" "qtcreator.pri" "5" "rpath" "4" @@ -10529,6 +10808,7 @@ "endpuppetcommand.h" "6" "informationchangedcommand.h" "6" "pixmapchangedcommand.h" "6" +"puppetalivecommand.h" "6" "removeinstancescommand.h" "6" "removepropertiescommand.h" "6" "removesharedmemorycommand.h" "6" @@ -10555,6 +10835,7 @@ "endpuppetcommand.cpp" "6" "informationchangedcommand.cpp" "6" "pixmapchangedcommand.cpp" "6" +"puppetalivecommand.cpp" "6" "removeinstancescommand.cpp" "6" "removepropertiescommand.cpp" "6" "removesharedmemorycommand.cpp" "6" @@ -10575,6 +10856,7 @@ "propertybindingcontainer.h" "6" "propertyvaluecontainer.h" "6" "reparentcontainer.h" "6" +"sharedmemory.h" "6" "Sources" "5" "addimportcontainer.cpp" "6" "idcontainer.cpp" "6" @@ -10585,6 +10867,8 @@ "propertybindingcontainer.cpp" "6" "propertyvaluecontainer.cpp" "6" "reparentcontainer.cpp" "6" +"sharedmemory_qt.cpp" "6" +"sharedmemory_unix.cpp" "6" "instances" "4" "instances.pri" "5" "Headers" "5" @@ -10660,6 +10944,7 @@ "html/welcome.html" "9" "images/template_image.png" "9" "images/webkit.png" "9" +"mockfiles/Window.qml" "9" "qtcreator" "4" "qtcreator.pri" "5" "rpath" "4" @@ -10794,6 +11079,16 @@ "qtcreator.pri" "4" "Sources" "3" "wininterrupt.c" "4" +"winrtdebughelper" "2" +"winrtdebughelper.pro" "3" +"qtcreator" "3" +"qtcreator.pri" "4" +"Sources" "3" +"winrtdebughelper.cpp" "4" +"Other files" "3" +"winrtdebughelper.qbs" "4" +"Other files" "1" +"src.qbs" "2" "tests" "0" "tests.pro" "1" "auto" "1" @@ -10864,6 +11159,44 @@ "tst_ast.cpp" "5" "Other files" "4" "ast.qbs" "5" +"c99" "3" +"c99.pro" "4" +"aggregation_dependencies" "4" +"aggregation_dependencies.pri" "5" +"coreplugin_dependencies" "4" +"coreplugin_dependencies.pri" "5" +"cplusplus_dependencies" "4" +"cplusplus_dependencies.pri" "5" +"cpptools_dependencies" "4" +"cpptools_dependencies.pri" "5" +"extensionsystem_dependencies" "4" +"extensionsystem_dependencies.pri" "5" +"languageutils_dependencies" "4" +"languageutils_dependencies.pri" "5" +"projectexplorer_dependencies" "4" +"projectexplorer_dependencies.pri" "5" +"qtcreator" "4" +"qtcreator.pri" "5" +"qttest" "4" +"qttest.pri" "5" +"qttestrpath" "4" +"qttestrpath.pri" "5" +"rpath" "4" +"rpath.pri" "5" +"shared" "4" +"shared.pri" "5" +"ssh_dependencies" "4" +"ssh_dependencies.pri" "5" +"texteditor_dependencies" "4" +"texteditor_dependencies.pri" "5" +"utils_dependencies" "4" +"utils_dependencies.pri" "5" +"Sources" "4" +"tst_c99.cpp" "5" +"Other files" "4" +"data" "5" +"designatedInitializer.1.c" "6" +"c99.qbs" "5" "checksymbols" "3" "checksymbols.pro" "4" "aggregation_dependencies" "4" @@ -10896,6 +11229,8 @@ "texteditor_dependencies.pri" "5" "utils_dependencies" "4" "utils_dependencies.pri" "5" +"Headers" "4" +"cplusplus_global.h" "6" "Sources" "4" "tst_checksymbols.cpp" "5" "Other files" "4" @@ -11011,6 +11346,8 @@ "texteditor_dependencies.pri" "5" "utils_dependencies" "4" "utils_dependencies.pri" "5" +"Headers" "4" +"cplusplus_global.h" "6" "Sources" "4" "tst_findusages.cpp" "5" "Other files" "4" @@ -11047,6 +11384,8 @@ "texteditor_dependencies.pri" "5" "utils_dependencies" "4" "utils_dependencies.pri" "5" +"Headers" "4" +"cplusplus_global.h" "6" "Sources" "4" "tst_lexer.cpp" "5" "Other files" "4" @@ -11224,6 +11563,44 @@ "tst_semantic.cpp" "5" "Other files" "4" "semantic.qbs" "5" +"translationunit" "3" +"translationunit.pro" "4" +"aggregation_dependencies" "4" +"aggregation_dependencies.pri" "5" +"coreplugin_dependencies" "4" +"coreplugin_dependencies.pri" "5" +"cplusplus_dependencies" "4" +"cplusplus_dependencies.pri" "5" +"cpptools_dependencies" "4" +"cpptools_dependencies.pri" "5" +"extensionsystem_dependencies" "4" +"extensionsystem_dependencies.pri" "5" +"languageutils_dependencies" "4" +"languageutils_dependencies.pri" "5" +"projectexplorer_dependencies" "4" +"projectexplorer_dependencies.pri" "5" +"qtcreator" "4" +"qtcreator.pri" "5" +"qttest" "4" +"qttest.pri" "5" +"qttestrpath" "4" +"qttestrpath.pri" "5" +"rpath" "4" +"rpath.pri" "5" +"shared" "4" +"shared.pri" "5" +"ssh_dependencies" "4" +"ssh_dependencies.pri" "5" +"texteditor_dependencies" "4" +"texteditor_dependencies.pri" "5" +"utils_dependencies" "4" +"utils_dependencies.pri" "5" +"Headers" "4" +"cplusplus_global.h" "6" +"Sources" "4" +"tst_translationunit.cpp" "5" +"Other files" "4" +"translationunit.qbs" "5" "typeprettyprinter" "3" "typeprettyprinter.pro" "4" "aggregation_dependencies" "4" @@ -11426,6 +11803,8 @@ "qtcreator.pri" "7" "qttestrpath" "6" "qttestrpath.pri" "7" +"utils_dependencies" "6" +"utils_dependencies.pri" "7" "Headers" "6" "plugin1.h" "7" "Sources" "6" @@ -11447,6 +11826,8 @@ "qtcreator.pri" "7" "qttestrpath" "6" "qttestrpath.pri" "7" +"utils_dependencies" "6" +"utils_dependencies.pri" "7" "Headers" "6" "plugin2.h" "7" "Sources" "6" @@ -11468,6 +11849,8 @@ "qtcreator.pri" "7" "qttestrpath" "6" "qttestrpath.pri" "7" +"utils_dependencies" "6" +"utils_dependencies.pri" "7" "Headers" "6" "plugin3.h" "7" "Sources" "6" @@ -11493,6 +11876,8 @@ "qttest.pri" "7" "qttestrpath" "6" "qttestrpath.pri" "7" +"utils_dependencies" "6" +"utils_dependencies.pri" "7" "Headers" "6" "plugin1.h" "7" "Sources" "6" @@ -11516,6 +11901,8 @@ "qttest.pri" "7" "qttestrpath" "6" "qttestrpath.pri" "7" +"utils_dependencies" "6" +"utils_dependencies.pri" "7" "Headers" "6" "plugin2.h" "7" "Sources" "6" @@ -11539,6 +11926,8 @@ "qttest.pri" "7" "qttestrpath" "6" "qttestrpath.pri" "7" +"utils_dependencies" "6" +"utils_dependencies.pri" "7" "Headers" "6" "plugin3.h" "7" "Sources" "6" @@ -11562,6 +11951,8 @@ "qttest.pri" "6" "qttestrpath" "5" "qttestrpath.pri" "6" +"utils_dependencies" "5" +"utils_dependencies.pri" "6" "Sources" "5" "plugins" "6" "myplug" "7" @@ -11591,6 +11982,8 @@ "qttest.pri" "6" "qttestrpath" "5" "qttestrpath.pri" "6" +"utils_dependencies" "5" +"utils_dependencies.pri" "6" "Sources" "5" "testdependencies" "6" "spec1.xml" "7" @@ -11644,6 +12037,8 @@ "qtcreator.pri" "6" "qttestrpath" "5" "qttestrpath.pri" "6" +"utils_dependencies" "5" +"utils_dependencies.pri" "6" "Headers" "5" "testplugin.h" "6" "testplugin_global.h" "6" @@ -12106,6 +12501,14 @@ "callgrind.pro" "4" "callgrindparsertests" "4" "callgrindparsertests.pro" "5" +"aggregation_dependencies" "5" +"aggregation_dependencies.pri" "6" +"coreplugin_dependencies" "5" +"coreplugin_dependencies.pri" "6" +"extensionsystem_dependencies" "5" +"extensionsystem_dependencies.pri" "6" +"projectexplorer_dependencies" "5" +"projectexplorer_dependencies.pri" "6" "qtcreator" "5" "qtcreator.pri" "6" "qttest" "5" @@ -12114,6 +12517,8 @@ "qttestrpath.pri" "6" "ssh_dependencies" "5" "ssh_dependencies.pri" "6" +"texteditor_dependencies" "5" +"texteditor_dependencies.pri" "6" "utils_dependencies" "5" "utils_dependencies.pri" "6" "valgrind_test" "5" @@ -12191,12 +12596,22 @@ "memcheck.pro" "4" "modeldemo" "4" "modeldemo.pro" "5" +"aggregation_dependencies" "5" +"aggregation_dependencies.pri" "6" +"coreplugin_dependencies" "5" +"coreplugin_dependencies.pri" "6" +"extensionsystem_dependencies" "5" +"extensionsystem_dependencies.pri" "6" +"projectexplorer_dependencies" "5" +"projectexplorer_dependencies.pri" "6" "qtcreator" "5" "qtcreator.pri" "6" "qttestrpath" "5" "qttestrpath.pri" "6" "ssh_dependencies" "5" "ssh_dependencies.pri" "6" +"texteditor_dependencies" "5" +"texteditor_dependencies.pri" "6" "utils_dependencies" "5" "utils_dependencies.pri" "6" "valgrind_test" "5" @@ -12272,6 +12687,14 @@ "modeldemo.qbs" "6" "parsertests" "4" "parsertests.pro" "5" +"aggregation_dependencies" "5" +"aggregation_dependencies.pri" "6" +"coreplugin_dependencies" "5" +"coreplugin_dependencies.pri" "6" +"extensionsystem_dependencies" "5" +"extensionsystem_dependencies.pri" "6" +"projectexplorer_dependencies" "5" +"projectexplorer_dependencies.pri" "6" "qtcreator" "5" "qtcreator.pri" "6" "qttest" "5" @@ -12280,6 +12703,8 @@ "qttestrpath.pri" "6" "ssh_dependencies" "5" "ssh_dependencies.pri" "6" +"texteditor_dependencies" "5" +"texteditor_dependencies.pri" "6" "utils_dependencies" "5" "utils_dependencies.pri" "6" "valgrind_test" "5" @@ -12405,6 +12830,14 @@ "main.cpp" "7" "testrunner" "4" "testrunner.pro" "5" +"aggregation_dependencies" "5" +"aggregation_dependencies.pri" "6" +"coreplugin_dependencies" "5" +"coreplugin_dependencies.pri" "6" +"extensionsystem_dependencies" "5" +"extensionsystem_dependencies.pri" "6" +"projectexplorer_dependencies" "5" +"projectexplorer_dependencies.pri" "6" "qtcreator" "5" "qtcreator.pri" "6" "qttest" "5" @@ -12413,6 +12846,8 @@ "qttestrpath.pri" "6" "ssh_dependencies" "5" "ssh_dependencies.pri" "6" +"texteditor_dependencies" "5" +"texteditor_dependencies.pri" "6" "utils_dependencies" "5" "utils_dependencies.pri" "6" "valgrind_test" "5" @@ -12711,102 +13146,6 @@ "fakevimactions.cpp" "6" "fakevimhandler.cpp" "6" "main.cpp" "4" -"plain-cplusplus" "2" -"plain-cplusplus.pro" "3" -"cplusplus" "3" -"cplusplus.pri" "4" -"Headers" "4" -"AST.h" "5" -"ASTfwd.h" "5" -"ASTMatcher.h" "5" -"ASTPatternBuilder.h" "5" -"ASTVisitor.h" "5" -"Bind.h" "5" -"Control.h" "5" -"CoreTypes.h" "5" -"CPlusPlus.h" "5" -"CPlusPlusForwardDeclarations.h" "5" -"cppassert.h" "5" -"DiagnosticClient.h" "5" -"FullySpecifiedType.h" "5" -"Lexer.h" "5" -"Literals.h" "5" -"LiteralTable.h" "5" -"Matcher.h" "5" -"MemoryPool.h" "5" -"Name.h" "5" -"Names.h" "5" -"NameVisitor.h" "5" -"ObjectiveCTypeQualifiers.h" "5" -"Parser.h" "5" -"QtContextKeywords.h" "5" -"SafeMatcher.h" "5" -"Scope.h" "5" -"Symbol.h" "5" -"Symbols.h" "5" -"SymbolVisitor.h" "5" -"Templates.h" "5" -"Token.h" "5" -"TranslationUnit.h" "5" -"Type.h" "5" -"TypeVisitor.h" "5" -"Sources" "4" -"AST.cpp" "5" -"ASTClone.cpp" "5" -"ASTMatch0.cpp" "5" -"ASTMatcher.cpp" "5" -"ASTPatternBuilder.cpp" "5" -"ASTVisit.cpp" "5" -"ASTVisitor.cpp" "5" -"Bind.cpp" "5" -"Control.cpp" "5" -"CoreTypes.cpp" "5" -"DiagnosticClient.cpp" "5" -"FullySpecifiedType.cpp" "5" -"Keywords.cpp" "5" -"Lexer.cpp" "5" -"Literals.cpp" "5" -"LiteralTable.cpp" "5" -"Matcher.cpp" "5" -"MemoryPool.cpp" "5" -"Name.cpp" "5" -"Names.cpp" "5" -"NameVisitor.cpp" "5" -"ObjectiveCAtKeywords.cpp" "5" -"ObjectiveCTypeQualifiers.cpp" "5" -"Parser.cpp" "5" -"QtContextKeywords.cpp" "5" -"SafeMatcher.cpp" "5" -"Scope.cpp" "5" -"Symbol.cpp" "5" -"Symbols.cpp" "5" -"SymbolVisitor.cpp" "5" -"Templates.cpp" "5" -"Token.cpp" "5" -"TranslationUnit.cpp" "5" -"Type.cpp" "5" -"TypeVisitor.cpp" "5" -"Headers" "3" -"Preprocessor.h" "4" -"Sources" "3" -"main.cpp" "4" -"Preprocessor.cpp" "4" -"preprocessor" "2" -"preprocessor.pro" "3" -"cplusplus_dependencies" "3" -"cplusplus_dependencies.pri" "4" -"languageutils_dependencies" "3" -"languageutils_dependencies.pri" "4" -"qtcreator" "3" -"qtcreator.pri" "4" -"qttest" "3" -"qttest.pri" "4" -"qttestrpath" "3" -"qttestrpath.pri" "4" -"utils_dependencies" "3" -"utils_dependencies.pri" "4" -"Sources" "3" -"main.cpp" "4" "process" "2" "process.pro" "3" "qtcreator" "3" @@ -13204,6 +13543,9 @@ "changes-3.0.0" "2" "changes-3.0.1" "2" "changes-3.1.0" "2" +"changes-3.1.1" "2" +"changes-3.1.2" "2" +"changes-3.2.0" "2" "copyright_template.txt" "2" "scripts" "1" "checkInstalledFiles.py" "2" From 9d95afc803abe0cb41e882c780d05fe646ae13f2 Mon Sep 17 00:00:00 2001 From: Thomas Epting Date: Mon, 18 Aug 2014 16:30:43 +0200 Subject: [PATCH 26/53] QbsProjectManager: Write enable project files before adding/removing Prevent failures in situations where Qbs project files are still write protected, like e.g. in Perforce VCS. Change-Id: I2828546adcc314b7c6b0b6720e1cf96733d62fa5 Reviewed-by: Christian Kandeler --- src/plugins/qbsprojectmanager/qbsproject.cpp | 27 ++++++++++++++++++++ src/plugins/qbsprojectmanager/qbsproject.h | 2 ++ 2 files changed, 29 insertions(+) diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 11d20a80e44..e1156498688 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -39,6 +39,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -68,6 +71,7 @@ #include #include #include +#include #include using namespace Core; @@ -229,6 +233,27 @@ private: bool m_wasInDocumentManager; }; +bool QbsProject::ensureWriteableQbsFile(const QString &file) +{ + // Ensure that the file is not read only + QFileInfo fi(file); + if (!fi.isWritable()) { + // Try via vcs manager + Core::IVersionControl *versionControl = + Core::VcsManager::findVersionControlForDirectory(fi.absolutePath()); + if (!versionControl || !versionControl->vcsOpen(file)) { + bool makeWritable = QFile::setPermissions(file, fi.permissions() | QFile::WriteUser); + if (!makeWritable) { + QMessageBox::warning(Core::ICore::mainWindow(), + tr("Failed!"), + tr("Could not write project file %1.").arg(file)); + return false; + } + } + } + return true; +} + bool QbsProject::addFilesToProduct(QbsBaseProjectNode *node, const QStringList &filePaths, const qbs::ProductData &productData, const qbs::GroupData &groupData, QStringList *notAdded) { @@ -236,6 +261,7 @@ bool QbsProject::addFilesToProduct(QbsBaseProjectNode *node, const QStringList & QStringList allPaths = groupData.allFilePaths(); const QString productFilePath = productData.location().fileName(); ChangeExpector expector(productFilePath, m_qbsDocuments); + ensureWriteableQbsFile(productFilePath); foreach (const QString &path, filePaths) { qbs::ErrorInfo err = m_qbsProject.addFiles(productData, groupData, QStringList() << path); if (err.hasError()) { @@ -261,6 +287,7 @@ bool QbsProject::removeFilesFromProduct(QbsBaseProjectNode *node, const QStringL QStringList allPaths = groupData.allFilePaths(); const QString productFilePath = productData.location().fileName(); ChangeExpector expector(productFilePath, m_qbsDocuments); + ensureWriteableQbsFile(productFilePath); foreach (const QString &path, filePaths) { qbs::ErrorInfo err = m_qbsProject.removeFiles(productData, groupData, QStringList() << path); diff --git a/src/plugins/qbsprojectmanager/qbsproject.h b/src/plugins/qbsprojectmanager/qbsproject.h index 75d9f428811..84dcda80e96 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.h +++ b/src/plugins/qbsprojectmanager/qbsproject.h @@ -135,6 +135,8 @@ private: void updateDeploymentInfo(const qbs::Project &project); void updateBuildTargetData(); + static bool ensureWriteableQbsFile(const QString &file); + QbsManager *const m_manager; const QString m_projectName; const QString m_fileName; From 0fec5584865b37dd05de3a19158f5a6012f86cda Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 26 Aug 2014 15:24:32 +0200 Subject: [PATCH 27/53] FancyMainWindow: Don't relay enter events as leave events Change-Id: Ia92929d69d8d25b926be3061dbe3ee5dc95ff44a (cherry picked from commit f6fea87a4d2ddb3bf70b702a1c140e336beaddbb) Reviewed-by: Ulf Hermann Reviewed-by: Eike Ziller --- src/libs/utils/fancymainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp index 62c3d912555..c05b0540e2f 100644 --- a/src/libs/utils/fancymainwindow.cpp +++ b/src/libs/utils/fancymainwindow.cpp @@ -248,7 +248,7 @@ public: void enterEvent(QEvent *event) { QApplication::instance()->installEventFilter(this); - QDockWidget::leaveEvent(event); + QDockWidget::enterEvent(event); } void leaveEvent(QEvent *event) From 83378d2af37b01956c72cfc219ee8136720eb042 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 26 Aug 2014 16:13:20 +0200 Subject: [PATCH 28/53] QmlDesigner: Fix typo Change-Id: I36c8393ace088d7702d1771e806e1e420eb8bd95 Reviewed-by: Mitch Curtis --- .../HelperWidgets/ColorEditor.qml | 18 +++++++++--------- .../ColorEditorTemplate.template | 4 ++-- .../QtQuick/RectangleSpecifics.qml | 4 ++-- .../QtQuick/TextEditSpecifics.qml | 4 ++-- .../QtQuick/TextInputSpecifics.qml | 4 ++-- .../QtQuick/TextSpecifics.qml | 4 ++-- .../Controls/TextAreaSpecifics.qml | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml index 6fe7636fad5..84d172d1dec 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml @@ -44,9 +44,9 @@ Column { property alias caption: label.text - property variant backendendValue + property variant backendValue - property variant value: backendendValue.value + property variant value: backendValue.value property alias gradientPropertyName: gradientLine.gradientPropertyName @@ -58,7 +58,7 @@ Column { colorEditor.color = colorEditor.value } - onBackendendValueChanged: { + onBackendValueChanged: { colorEditor.color = colorEditor.value } @@ -68,8 +68,8 @@ Column { interval: 100 running: false onTriggered: { - if (backendendValue !== undefined) - backendendValue.value = colorEditor.color + if (backendValue !== undefined) + backendValue.value = colorEditor.color } } @@ -168,7 +168,7 @@ Column { showTranslateCheckBox: false - backendValue: colorEditor.backendendValue + backendValue: colorEditor.backendValue onAccepted: { colorEditor.color = colorFromString(textField.text) @@ -177,7 +177,7 @@ Column { onCommitData: { colorEditor.color = colorFromString(textField.text) if (isNotInGradientMode()) - backendendValue.value = colorEditor.color + backendValue.value = colorEditor.color } Layout.fillWidth: true @@ -195,7 +195,7 @@ Column { ButtonRowButton { iconSource: "images/icon_color_solid.png" onClicked: { - colorEditor.backendendValue.resetValue() + colorEditor.backendValue.resetValue() gradientLine.deleteGradient() } toolTip: qsTr("Solid Color") @@ -204,7 +204,7 @@ Column { visible: supportGradient iconSource: "images/icon_color_gradient.png" onClicked: { - colorEditor.backendendValue.resetValue() + colorEditor.backendValue.resetValue() gradientLine.addGradient() } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/ColorEditorTemplate.template b/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/ColorEditorTemplate.template index 0c2c697ecc2..4ae345c678c 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/ColorEditorTemplate.template +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/ColorEditorTemplate.template @@ -3,6 +3,6 @@ Item { ColorEditor { caption: "%1" - backendColor: backendValues.%2 + backendValue: backendValues.%2 supportGradient: false -} \ No newline at end of file +} diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RectangleSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RectangleSpecifics.qml index 9dd3a448940..1a7cd209e85 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RectangleSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RectangleSpecifics.qml @@ -43,7 +43,7 @@ Column { ColorEditor { caption: qsTr("Color") - backendendValue: backendValues.color + backendValue: backendValues.color supportGradient: true } @@ -57,7 +57,7 @@ Column { ColorEditor { caption: qsTr("Border Color") - backendendValue: backendValues.border_color + backendValue: backendValues.border_color supportGradient: false } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml index 642550dd2a3..8c4d4167508 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml @@ -48,7 +48,7 @@ Column { ColorEditor { caption: qsTr("Text Color") - backendendValue: backendValues.color + backendValue: backendValues.color supportGradient: false } @@ -61,7 +61,7 @@ Column { ColorEditor { caption: qsTr("Selection Color") - backendendValue: backendValues.selectionColor + backendValue: backendValues.selectionColor supportGradient: false } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSpecifics.qml index 5270bc9618e..c829d1f8069 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSpecifics.qml @@ -47,7 +47,7 @@ Column { ColorEditor { caption: qsTr("Text Color") - backendendValue: backendValues.color + backendValue: backendValues.color supportGradient: false } @@ -60,7 +60,7 @@ Column { ColorEditor { caption: qsTr("Selection Color") - backendendValue: backendValues.selectionColor + backendValue: backendValues.selectionColor supportGradient: false } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextSpecifics.qml index b25a7b0d4aa..9fc19efcc07 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextSpecifics.qml @@ -49,7 +49,7 @@ Column { ColorEditor { caption: qsTr("Text Color") - backendendValue: backendValues.color + backendValue: backendValues.color supportGradient: false } @@ -62,7 +62,7 @@ Column { ColorEditor { caption: qsTr("Style Color") - backendendValue: backendValues.styleColor + backendValue: backendValues.styleColor supportGradient: false } } diff --git a/src/plugins/qmldesigner/componentsplugin/Controls/TextAreaSpecifics.qml b/src/plugins/qmldesigner/componentsplugin/Controls/TextAreaSpecifics.qml index 7835bd2842c..70347cf6dbb 100644 --- a/src/plugins/qmldesigner/componentsplugin/Controls/TextAreaSpecifics.qml +++ b/src/plugins/qmldesigner/componentsplugin/Controls/TextAreaSpecifics.qml @@ -44,7 +44,7 @@ Column { ColorEditor { caption: qsTr("Color") - backendendValue: backendValues.textColor + backendValue: backendValues.textColor supportGradient: false } } From 7d23c5050237d3a9c2fdf1ac9edf2ab139ef0c48 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 27 Aug 2014 10:28:58 +0200 Subject: [PATCH 29/53] Fix deployment of clang library Since the plugins moved in 6aad96d89b5cd4f8b7e06b72cf911054c5d89037, the rpath of the clang code model plugin was broken for deployed clang library. Change-Id: I5d59390540918c73a2cd217bb5ebf8f947122f01 Reviewed-by: Erik Verbruggen --- scripts/deployqtHelper_mac.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index 78188870b64..4f1667f2a0c 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -60,6 +60,6 @@ if [ $LLVM_INSTALL_DIR ]; then if [ ! -f "$_CLANG_CODEMODEL_LIB" ]; then _CLANG_CODEMODEL_LIB="$1/Contents/PlugIns/libClangCodeModel.dylib" fi - xcrun install_name_tool -rpath "$LLVM_INSTALL_DIR/lib" "@loader_path/.." "$_CLANG_CODEMODEL_LIB" || true + xcrun install_name_tool -rpath "$LLVM_INSTALL_DIR/lib" "@loader_path" "$_CLANG_CODEMODEL_LIB" || true fi From 3237a5166b242bc14ff9b9b75134b2c72d1e0ce1 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 28 Aug 2014 09:16:17 +0200 Subject: [PATCH 30/53] Fix the clang deployment fix it needs a / at the end ... Change-Id: I546d70bf8e1d70ca3e08e3d563e427a96ad73209 Reviewed-by: Eike Ziller --- scripts/deployqtHelper_mac.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index 4f1667f2a0c..d8e729c7877 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -60,6 +60,6 @@ if [ $LLVM_INSTALL_DIR ]; then if [ ! -f "$_CLANG_CODEMODEL_LIB" ]; then _CLANG_CODEMODEL_LIB="$1/Contents/PlugIns/libClangCodeModel.dylib" fi - xcrun install_name_tool -rpath "$LLVM_INSTALL_DIR/lib" "@loader_path" "$_CLANG_CODEMODEL_LIB" || true + xcrun install_name_tool -rpath "$LLVM_INSTALL_DIR/lib" "@loader_path/" "$_CLANG_CODEMODEL_LIB" || true fi From 30dde7d6376bca4be6cb0d8de83080cf5f793391 Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Thu, 28 Aug 2014 10:08:15 +0200 Subject: [PATCH 31/53] Fix extraSelections call extraSelections is a local variable as well as a member function of BaseTextEditorWidget, but if the full qualified name is used the compiler thinks that this is a static function call, which happens with the MSVC 2010. Use the this pointer to use the correct function. Change-Id: I44ce96b2c17e7259274f2103ce70ae9b2ae3a56b Reviewed-by: hjk --- src/plugins/texteditor/basetexteditor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 7e5671bd871..f957b23c4c7 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -5206,7 +5206,7 @@ void BaseTextEditorWidget::_q_matchParentheses() if (animatePosition >= 0) { - foreach (const QTextEdit::ExtraSelection &sel, BaseTextEditorWidget::extraSelections(ParenthesesMatchingSelection)) { + foreach (const QTextEdit::ExtraSelection &sel, this->extraSelections(ParenthesesMatchingSelection)) { if (sel.cursor.selectionStart() == animatePosition || sel.cursor.selectionEnd() - 1 == animatePosition) { animatePosition = -1; From 9530f0f7a039e1ca855a671b778709e49bc749ab Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 28 Aug 2014 10:28:29 +0300 Subject: [PATCH 32/53] Debugger: Remove default shortcut for Restart Debugging It conflicts with Rename Symbol Change-Id: I168fe7975712ce4ff8c04099d8b2aff8e82d1325 Reviewed-by: hjk --- src/plugins/debugger/debuggerplugin.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 284b513a458..7593d650b12 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -3125,7 +3125,6 @@ void DebuggerPluginPrivate::extensionsInitialized() cmd = ActionManager::registerAction(m_resetAction, Constants::RESET, globalcontext); cmd->setDescription(tr("Restart Debugging")); - cmd->setDefaultKeySequence(QKeySequence(tr("Shift+Ctrl+R"))); debugMenu->addAction(cmd, CC::G_DEFAULT_ONE); debugMenu->addSeparator(globalcontext); From 96a32bf2cb98d73d56933c89016415c64ac4619f Mon Sep 17 00:00:00 2001 From: jkobus Date: Mon, 25 Aug 2014 10:33:48 +0200 Subject: [PATCH 33/53] Add qtquick 2.3 and qtquickcontrols 1.2 templates Change-Id: Id71a21b273d2d156cb55033ad6a9ae2bcf5565ca Reviewed-by: Kai Koehne --- .../templates/qml/qtquick_1_1/template.xml | 2 +- .../templates/qml/qtquick_2_1/template.xml | 2 +- .../templates/qml/qtquick_2_2/template.xml | 2 +- .../templates/qml/qtquick_2_3/main.qml | 19 ++++++++++++ .../templates/qml/qtquick_2_3/main.qmlproject | 21 ++++++++++++++ .../templates/qml/qtquick_2_3/template.xml | 6 ++++ .../qml/qtquickcontrols_1_0/template.xml | 2 +- .../qml/qtquickcontrols_1_1/main.qml | 2 +- .../qml/qtquickcontrols_1_1/template.xml | 2 +- .../qml/qtquickcontrols_1_2/main.qml | 29 +++++++++++++++++++ .../qml/qtquickcontrols_1_2/main.qmlproject | 21 ++++++++++++++ .../qml/qtquickcontrols_1_2/template.xml | 6 ++++ .../qtquick/qtquick_1_1/template.xml | 2 +- .../templates/qtquick/qtquick_2_1/main.qml | 2 +- .../qtquick/qtquick_2_1/template.xml | 2 +- .../qtquick/qtquick_2_2/template.xml | 2 +- .../templates/qtquick/qtquick_2_3/app.pro | 14 +++++++++ .../templates/qtquick/qtquick_2_3/main.cpp | 12 ++++++++ .../templates/qtquick/qtquick_2_3/main.qml | 20 +++++++++++++ .../templates/qtquick/qtquick_2_3/qml.qrc | 5 ++++ .../qtquick/qtquick_2_3/template.xml | 8 +++++ .../qtquick/qtquickcontrols_1_0/template.xml | 2 +- .../qtquick/qtquickcontrols_1_1/template.xml | 2 +- .../qtquick/qtquickcontrols_1_2/app.pro | 13 +++++++++ .../qtquick/qtquickcontrols_1_2/main.cpp | 12 ++++++++ .../qtquick/qtquickcontrols_1_2/main.qml | 28 ++++++++++++++++++ .../qtquick/qtquickcontrols_1_2/qml.qrc | 5 ++++ .../qtquick/qtquickcontrols_1_2/template.xml | 8 +++++ src/plugins/qtsupport/baseqtversion.cpp | 6 ++++ src/plugins/qtsupport/qtsupportconstants.h | 2 ++ 30 files changed, 247 insertions(+), 12 deletions(-) create mode 100644 share/qtcreator/templates/qml/qtquick_2_3/main.qml create mode 100644 share/qtcreator/templates/qml/qtquick_2_3/main.qmlproject create mode 100644 share/qtcreator/templates/qml/qtquick_2_3/template.xml create mode 100644 share/qtcreator/templates/qml/qtquickcontrols_1_2/main.qml create mode 100644 share/qtcreator/templates/qml/qtquickcontrols_1_2/main.qmlproject create mode 100644 share/qtcreator/templates/qml/qtquickcontrols_1_2/template.xml create mode 100644 share/qtcreator/templates/qtquick/qtquick_2_3/app.pro create mode 100644 share/qtcreator/templates/qtquick/qtquick_2_3/main.cpp create mode 100644 share/qtcreator/templates/qtquick/qtquick_2_3/main.qml create mode 100644 share/qtcreator/templates/qtquick/qtquick_2_3/qml.qrc create mode 100644 share/qtcreator/templates/qtquick/qtquick_2_3/template.xml create mode 100644 share/qtcreator/templates/qtquick/qtquickcontrols_1_2/app.pro create mode 100644 share/qtcreator/templates/qtquick/qtquickcontrols_1_2/main.cpp create mode 100644 share/qtcreator/templates/qtquick/qtquickcontrols_1_2/main.qml create mode 100644 share/qtcreator/templates/qtquick/qtquickcontrols_1_2/qml.qrc create mode 100644 share/qtcreator/templates/qtquick/qtquickcontrols_1_2/template.xml diff --git a/share/qtcreator/templates/qml/qtquick_1_1/template.xml b/share/qtcreator/templates/qml/qtquick_1_1/template.xml index c7be17228b4..75b8be65965 100644 --- a/share/qtcreator/templates/qml/qtquick_1_1/template.xml +++ b/share/qtcreator/templates/qml/qtquick_1_1/template.xml @@ -1,5 +1,5 @@ -