diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py index 09978e45a16..74be73c6edf 100644 --- a/share/qtcreator/debugger/lldbbridge.py +++ b/share/qtcreator/debugger/lldbbridge.py @@ -961,7 +961,7 @@ class Dumper(DumperBase): #if int(addr) == 0xffffffffffffffff: # raise RuntimeError("Illegal address") if self.currentPrintsAddress and not addr is None: - self.put('addr="0x%x",' % int(addr)) + self.put('address="0x%x",' % int(addr)) def isFunctionType(self, typeobj): if self.isGoodLldb: @@ -994,7 +994,7 @@ class Dumper(DumperBase): self.put('iname="%s",' % self.currentIName) self.putType(typeName) self.put('numchild="%s",' % numchild) - self.put('addr="0x%x",' % value.GetLoadAddress()) + self.put('address="0x%x",' % value.GetLoadAddress()) self.putItemCount(numchild) if self.currentIName in self.expandedINames: with Children(self): diff --git a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json index 29a51b8e41a..1b19a1b12b9 100644 --- a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json @@ -41,6 +41,14 @@ { "items": [ + { + "trKey": "Qt 5.6", + "value": + "{ + 'qtQuickVersion': '2.6', + 'qtQuickWindowVersion': '2.2' + }" + }, { "trKey": "Qt 5.5", "value": diff --git a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json index 7d601d3dbd7..c161219fa8b 100644 --- a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json @@ -43,6 +43,16 @@ { "items": [ + { + "trKey": "Qt 5.6", + "value": + "{ + 'qtQuickVersion': '2.6', + 'qtQuickControlsVersion': '1.5', + 'qtQuickDialogsVersion': '1.2', + 'qtQuickLayoutsVersion': '1.3' + }" + }, { "trKey": "Qt 5.5", "value": diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 6a0c46a7476..0154b6c420f 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -28819,6 +28819,10 @@ This is independent of the visibility property in QML. QmlDesigner::QmlDesignerPlugin + + Cannot create OpenGL context. + Не удалось создать контекст OpenGL. + Switch Text/Design Переключить текст/дизайн @@ -30591,6 +30595,10 @@ references to elements in other files, loops, and so on.) QmlProfiler::Internal::QmlProfilerPlugin + + Cannot create OpenGL context. + Не удалось создать контекст OpenGL. + QML Profiler Профайлер QML @@ -38677,6 +38685,13 @@ should a repository require SSH-authentication (see documentation on SSH and the Ошибка загрузки режима приветствия + + Welcome::Internal::WelcomePlugin + + Cannot create OpenGL context. + Не удалось создать контекст OpenGL. + + WidgetPluginManager diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 86a6a3ade5e..d20a05029f5 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -511,9 +511,21 @@ bool AndroidManager::updateGradleProperties(ProjectExplorer::Target *target) AndroidBuildApkStep *buildApkStep = AndroidGlobal::buildStep(target->activeBuildConfiguration()); - if (!buildApkStep || !buildApkStep->androidPackageSourceDir().appendPath(QLatin1String("gradlew")).exists()) + if (!buildApkStep || !buildApkStep->useGradle() || !buildApkStep->androidPackageSourceDir().appendPath(QLatin1String("gradlew")).exists()) return false; + Utils::FileName wrapperProps(buildApkStep->androidPackageSourceDir()); + wrapperProps.appendPath(QLatin1String("gradle/wrapper/gradle-wrapper.properties")); + if (wrapperProps.exists()) { + GradleProperties wrapperProperties = readGradleProperties(wrapperProps.toString()); + QString distributionUrl = QString::fromLocal8Bit(wrapperProperties["distributionUrl"]); + QRegExp re(QLatin1String(".*services.gradle.org/distributions/gradle-2..*.zip")); + if (!re.exactMatch(distributionUrl)) { + wrapperProperties["distributionUrl"] = "https\\://services.gradle.org/distributions/gradle-2.2.1-all.zip"; + mergeGradleProperties(wrapperProps.toString(), wrapperProperties); + } + } + GradleProperties localProperties; localProperties["sdk.dir"] = AndroidConfigurations::currentConfig().sdkLocation().toString().toLocal8Bit(); if (!mergeGradleProperties(buildApkStep->androidPackageSourceDir().appendPath(QLatin1String("local.properties")).toString(), localProperties)) diff --git a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp index 2e51d28720d..64916930029 100644 --- a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp +++ b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp @@ -34,10 +34,15 @@ #include #include + +#include #include +#include #include +#include #include +#include using namespace QmakeAndroidSupport::Internal; @@ -93,7 +98,16 @@ ProjectExplorer::BuildConfiguration *AndroidQmakeBuildConfigurationFactory::rest AndroidQmakeBuildConfiguration::AndroidQmakeBuildConfiguration(ProjectExplorer::Target *target) : QmakeProjectManager::QmakeBuildConfiguration(target) { + using QmakeProjectManager::QmakeProject; + auto updateGrade = [this] { + Android::AndroidManager::updateGradleProperties(BuildConfiguration::target()); + }; + QmakeProject *project = qobject_cast(target->project()); + if (project) + connect(project, &QmakeProject::proFilesEvaluated, this, updateGrade); + else + connect(this, &AndroidQmakeBuildConfiguration::enabledChanged, this, updateGrade); } AndroidQmakeBuildConfiguration::AndroidQmakeBuildConfiguration(ProjectExplorer::Target *target, AndroidQmakeBuildConfiguration *source) @@ -110,6 +124,27 @@ AndroidQmakeBuildConfiguration::AndroidQmakeBuildConfiguration(ProjectExplorer:: void AndroidQmakeBuildConfiguration::addToEnvironment(Utils::Environment &env) const { - env.set(QLatin1String("ANDROID_NDK_PLATFORM"), - Android::AndroidConfigurations::currentConfig().bestNdkPlatformMatch(Android::AndroidManager::minimumSDK(target()))); + m_androidNdkPlatform = Android::AndroidConfigurations::currentConfig().bestNdkPlatformMatch(Android::AndroidManager::minimumSDK(target())); + env.set(QLatin1String("ANDROID_NDK_PLATFORM"), m_androidNdkPlatform); +} + +void AndroidQmakeBuildConfiguration::manifestSaved() +{ + using QmakeProjectManager::QMakeStep; + QString androidNdkPlatform = Android::AndroidConfigurations::currentConfig().bestNdkPlatformMatch(Android::AndroidManager::minimumSDK(target())); + if (m_androidNdkPlatform == androidNdkPlatform) + return; + + emitEnvironmentChanged(); + + QMakeStep *qs = qmakeStep(); + if (!qs) + return; + + qs->setForced(true); + + ProjectExplorer::BuildManager::buildList(stepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN), + ProjectExplorer::ProjectExplorerPlugin::displayNameForStepId(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)); + ProjectExplorer::BuildManager::appendStep(qs, ProjectExplorer::ProjectExplorerPlugin::displayNameForStepId(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)); + setSubNodeBuild(0); } diff --git a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h index 900a57855da..d4a52666123 100644 --- a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h +++ b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h @@ -61,8 +61,11 @@ public: AndroidQmakeBuildConfiguration(ProjectExplorer::Target *target, AndroidQmakeBuildConfiguration *source); AndroidQmakeBuildConfiguration(ProjectExplorer::Target *target, Core::Id id); void addToEnvironment(Utils::Environment &env) const; + void manifestSaved(); using BuildConfiguration::emitEnvironmentChanged; +private: + mutable QString m_androidNdkPlatform; }; } // namespace Internal diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp index a5ef5579ecf..23b190c2c1a 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp +++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp @@ -36,17 +36,9 @@ #include #include -#include -#include -#include -#include -#include #include #include -#include -#include #include -#include using namespace QmakeProjectManager; @@ -136,20 +128,8 @@ Utils::FileName QmakeAndroidSupport::androiddeployJsonPath(ProjectExplorer::Targ void QmakeAndroidSupport::manifestSaved(const ProjectExplorer::Target *target) { ProjectExplorer::BuildConfiguration *bc = target->activeBuildConfiguration(); - if (auto qbc = qobject_cast(bc)) { - qbc->emitEnvironmentChanged(); - - QMakeStep *qs = qbc->qmakeStep(); - if (!qs) - return; - - qs->setForced(true); - - ProjectExplorer::BuildManager::buildList(bc->stepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN), - ProjectExplorer::ProjectExplorerPlugin::displayNameForStepId(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)); - ProjectExplorer::BuildManager::appendStep(qs, ProjectExplorer::ProjectExplorerPlugin::displayNameForStepId(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)); - qbc->setSubNodeBuild(0); - } + if (auto qbc = qobject_cast(bc)) + qbc->manifestSaved(); } Utils::FileName QmakeAndroidSupport::manifestSourcePath(const ProjectExplorer::Target *target) diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index daa03fe04de..b2485359cfd 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -1812,7 +1812,7 @@ void QmakeProFileNode::asyncUpdate() m_project->incrementPendingEvaluateFutures(); setupReader(); if (!includedInExactParse()) - m_readerExact->setVerbose(false); + m_readerExact->setExact(false); m_parseFutureWatcher.waitForFinished(); EvalInput input = evalInput(); QFuture future = QtConcurrent::run(&QmakeProFileNode::asyncEvaluate, this, input); diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index ac5925d8a3a..7a2580f9e3d 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -65,10 +65,12 @@ static inline bool isSupportedAttachedProperties(const QString &propertyName) static inline QStringList supportedVersionsList() { - QStringList list; - list << QStringLiteral("2.0") << QStringLiteral("2.1") - << QStringLiteral("2.2") << QStringLiteral("2.3") - << QStringLiteral("2.4") << QStringLiteral("2.5"); + static const QStringList list = { + QStringLiteral("2.0"), QStringLiteral("2.1"), + QStringLiteral("2.2"), QStringLiteral("2.3"), + QStringLiteral("2.4"), QStringLiteral("2.5"), + QStringLiteral("2.6") + }; return list; } diff --git a/src/plugins/qtsupport/profilereader.cpp b/src/plugins/qtsupport/profilereader.cpp index 809342960e9..989ff73bcb9 100644 --- a/src/plugins/qtsupport/profilereader.cpp +++ b/src/plugins/qtsupport/profilereader.cpp @@ -46,8 +46,11 @@ static QString format(const QString &fileName, int lineNo, const QString &msg) return msg; } -ProMessageHandler::ProMessageHandler(bool verbose) +ProMessageHandler::ProMessageHandler(bool verbose, bool exact) : m_verbose(verbose) + , m_exact(exact) + //: Prefix used for output from the cumulative evaluation of project files. + , m_prefix(tr("[Inexact] ")) { QObject::connect(this, SIGNAL(writeMessage(QString,Core::MessageManager::PrintToOutputPaneFlags)), Core::MessageManager::instance(), SLOT(write(QString,Core::MessageManager::PrintToOutputPaneFlags)), @@ -56,14 +59,24 @@ ProMessageHandler::ProMessageHandler(bool verbose) void ProMessageHandler::message(int type, const QString &msg, const QString &fileName, int lineNo) { - if ((type & CategoryMask) == ErrorMessage && ((type & SourceMask) == SourceParser || m_verbose)) - emit writeMessage(format(fileName, lineNo, msg), Core::MessageManager::NoModeSwitch); + if ((type & CategoryMask) == ErrorMessage && ((type & SourceMask) == SourceParser || m_verbose)) { + QString fmsg = format(fileName, lineNo, msg); + if ((type & SourceMask) == SourceParser || m_exact) + emit writeMessage(fmsg, Core::MessageManager::NoModeSwitch); + else + emit writeMessage(m_prefix + fmsg, Core::MessageManager::NoModeSwitch); + } } -void ProMessageHandler::fileMessage(const QString &msg) +void ProMessageHandler::fileMessage(int type, const QString &msg) { - if (m_verbose) - emit writeMessage(msg, Core::MessageManager::NoModeSwitch); + Q_UNUSED(type) + if (m_verbose) { + if (m_exact) + emit writeMessage(msg, Core::MessageManager::NoModeSwitch); + else + emit writeMessage(m_prefix + msg, Core::MessageManager::NoModeSwitch); + } } diff --git a/src/plugins/qtsupport/profilereader.h b/src/plugins/qtsupport/profilereader.h index 3ab37cc1aca..e734c1c1f49 100644 --- a/src/plugins/qtsupport/profilereader.h +++ b/src/plugins/qtsupport/profilereader.h @@ -49,21 +49,24 @@ class QTSUPPORT_EXPORT ProMessageHandler : public QObject, public QMakeHandler Q_OBJECT public: - ProMessageHandler(bool verbose = true); + ProMessageHandler(bool verbose = true, bool exact = true); virtual ~ProMessageHandler() {} virtual void aboutToEval(ProFile *, ProFile *, EvalFileType) {} virtual void doneWithEval(ProFile *) {} virtual void message(int type, const QString &msg, const QString &fileName, int lineNo); - virtual void fileMessage(const QString &msg); + virtual void fileMessage(int type, const QString &msg); void setVerbose(bool on) { m_verbose = on; } + void setExact(bool on) { m_exact = on; } signals: void writeMessage(const QString &error, Core::MessageManager::PrintToOutputPaneFlags flag); private: bool m_verbose; + bool m_exact; + QString m_prefix; }; class QTSUPPORT_EXPORT ProFileReader : public ProMessageHandler, public QMakeParser, public ProFileEvaluator diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp index 0c6f9431b1f..f6cc329b849 100644 --- a/src/shared/proparser/qmakebuiltins.cpp +++ b/src/shared/proparser/qmakebuiltins.cpp @@ -399,7 +399,9 @@ QByteArray QMakeEvaluator::getCommandOutput(const QString &args) const if (!errout.isEmpty()) { if (errout.endsWith('\n')) errout.chop(1); - m_handler->message(QMakeHandler::EvalError, QString::fromLocal8Bit(errout)); + m_handler->message( + QMakeHandler::EvalError | (m_cumulative ? QMakeHandler::CumulativeEvalMessage : 0), + QString::fromLocal8Bit(errout)); } # endif out = proc.readAllStandardOutput(); @@ -1467,8 +1469,12 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( fputs(msg.toLatin1().constData(), stderr); #endif } else { - m_handler->fileMessage(fL1S("Project %1: %2") - .arg(function.toQString(m_tmp1).toUpper(), msg)); + m_handler->fileMessage( + (func_t == T_ERROR ? QMakeHandler::ErrorMessage : + func_t == T_WARNING ? QMakeHandler::WarningMessage : + QMakeHandler::InfoMessage) + | (m_cumulative ? QMakeHandler::CumulativeEvalMessage : 0), + fL1S("Project %1: %2").arg(function.toQString(m_tmp1).toUpper(), msg)); } } return (func_t == T_ERROR && !m_cumulative) ? ReturnError : ReturnTrue; diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index 86ff07b6550..72d9d31b173 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -1303,7 +1303,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateConfigFeatures() config.detach(); processed.insert(config); VisitReturn vr = evaluateFeatureFile(config, true); - if (vr == ReturnError) + if (vr == ReturnError && !m_cumulative) return vr; if (vr == ReturnTrue) { finished = false; @@ -1981,7 +1981,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateFileInto( void QMakeEvaluator::message(int type, const QString &msg) const { if (!m_skipLevel) - m_handler->message(type, msg, + m_handler->message(type | (m_cumulative ? QMakeHandler::CumulativeEvalMessage : 0), msg, m_current.line ? m_current.pro->fileName() : QString(), m_current.line != 0xffff ? m_current.line : -1); } diff --git a/src/shared/proparser/qmakeevaluator.h b/src/shared/proparser/qmakeevaluator.h index 31d05e74c79..8538e8b4f0b 100644 --- a/src/shared/proparser/qmakeevaluator.h +++ b/src/shared/proparser/qmakeevaluator.h @@ -65,6 +65,8 @@ public: enum { SourceEvaluator = 0x10, + CumulativeEvalMessage = 0x1000, + EvalWarnLanguage = SourceEvaluator | WarningMessage | WarnLanguage, EvalWarnDeprecated = SourceEvaluator | WarningMessage | WarnDeprecated, @@ -72,7 +74,7 @@ public: }; // error(), warning() and message() from .pro file - virtual void fileMessage(const QString &msg) = 0; + virtual void fileMessage(int type, const QString &msg) = 0; enum EvalFileType { EvalProjectFile, EvalIncludeFile, EvalConfigFile, EvalFeatureFile, EvalAuxFile }; virtual void aboutToEval(ProFile *parent, ProFile *proFile, EvalFileType type) = 0; diff --git a/src/shared/proparser/qmakeparser.h b/src/shared/proparser/qmakeparser.h index 91320c74914..a7d55c8d47c 100644 --- a/src/shared/proparser/qmakeparser.h +++ b/src/shared/proparser/qmakeparser.h @@ -47,8 +47,9 @@ class QMAKE_EXPORT QMakeParserHandler public: enum { CategoryMask = 0xf00, - WarningMessage = 0x000, - ErrorMessage = 0x100, + InfoMessage = 0x100, + WarningMessage = 0x200, + ErrorMessage = 0x300, SourceMask = 0xf0, SourceParser = 0, diff --git a/src/tools/clangbackend/clangbackend.pro b/src/tools/clangbackend/clangbackend.pro index 452eb8dbded..c3210fedbfb 100644 --- a/src/tools/clangbackend/clangbackend.pro +++ b/src/tools/clangbackend/clangbackend.pro @@ -16,5 +16,5 @@ SOURCES += clangbackendmain.cpp unix { !osx: QMAKE_LFLAGS += -Wl,-z,origin - QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR}) + !disable_external_rpath: QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR}) } diff --git a/tests/system/shared/workarounds.py b/tests/system/shared/workarounds.py index cea2ced11aa..29ec1e281f6 100644 --- a/tests/system/shared/workarounds.py +++ b/tests/system/shared/workarounds.py @@ -261,7 +261,6 @@ class JIRA: def __initBugDict__(self): self.__bugs__= { 'QTCREATORBUG-6853':self._workaroundCreator6853_, - 'QTCREATORBUG-15456':self._workaroundCreator15456_, } # helper function - will be called if no workaround for the requested bug is deposited def _exitFatal_(self, bugType, number): @@ -272,13 +271,3 @@ class JIRA: def _workaroundCreator6853_(self, *args): if "Release" in args[0] and platform.system() == "Linux": snooze(2) - - def _workaroundCreator15456_(self, *args): - isMsvc = args[0] - isQt5 = args[1] - config = args[2] - if isMsvc and isQt5 and config != "Release": - unexpectedExitMessage = ("{type='QMessageBox' unnamed='1' visible='1' " - "windowTitle='Unexpected CDB Exit'}") - clickButton(waitForObject("{text='OK' type='QPushButton' unnamed='1' " - "visible='1' window=%s}" % unexpectedExitMessage)) diff --git a/tests/system/suite_debugger/tst_cli_output_console/test.py b/tests/system/suite_debugger/tst_cli_output_console/test.py index 8873369c4ef..a3886cd0757 100644 --- a/tests/system/suite_debugger/tst_cli_output_console/test.py +++ b/tests/system/suite_debugger/tst_cli_output_console/test.py @@ -95,8 +95,6 @@ def main(): invokeMenuItem("Debug", "Start Debugging", "Start Debugging") JIRA.performWorkaroundForBug(6853, JIRA.Bug.CREATOR, config) handleDebuggerWarnings(config, isMsvc) - JIRA.performWorkaroundForBug(15456, JIRA.Bug.CREATOR, isMsvc, - checkedTargets[kit] & ~Targets.qt4Classes(), config) ensureChecked(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton") outputWindow = waitForObject(":Qt Creator_Core::OutputWindow") waitFor("'Debugging has finished' in str(outputWindow.plainText)", 20000) diff --git a/tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv b/tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv index 72a703ea063..ff20f7ae5b4 100644 --- a/tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv +++ b/tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv @@ -839,6 +839,30 @@ "cplusplus.qbs:3" "3" "General" "3" "cplusplus.qbs:88" "4" +"/codemodel" "5" +"images/class.png" "6" +"images/enum.png" "6" +"images/enumerator.png" "6" +"images/func.png" "6" +"images/func_priv.png" "6" +"images/func_priv_st.png" "6" +"images/func_prot.png" "6" +"images/func_prot_st.png" "6" +"images/func_st.png" "6" +"images/keyword.png" "6" +"images/macro.png" "6" +"images/namespace.png" "6" +"images/signal.png" "6" +"images/slot.png" "6" +"images/slot_priv.png" "6" +"images/slot_prot.png" "6" +"images/struct.png" "6" +"images/var.png" "6" +"images/var_priv.png" "6" +"images/var_priv_st.png" "6" +"images/var_prot.png" "6" +"images/var_prot_st.png" "6" +"images/var_st.png" "6" "AlreadyConsideredClassContainer.h" "4" "ASTParent.cpp" "4" "ASTParent.h" "4" @@ -846,7 +870,6 @@ "ASTPath.h" "4" "BackwardsScanner.cpp" "4" "BackwardsScanner.h" "4" -"cplusplus.qrc" "4" "CppDocument.cpp" "4" "CppDocument.h" "4" "cppmodelmanagerbase.cpp" "4" @@ -998,6 +1021,10 @@ "error.png" "4" "notloaded.png" "4" "ok.png" "4" +"/extensionsystem" "4" +"images/error.png" "5" +"images/notloaded.png" "5" +"images/ok.png" "5" "extensionsystem_global.h" "3" "invoker.cpp" "3" "invoker.h" "3" @@ -1025,7 +1052,6 @@ "pluginspec_p.h" "3" "pluginview.cpp" "3" "pluginview.h" "3" -"pluginview.qrc" "3" "GLSL" "2" "glsl.qbs:3" "3" "glsl.g" "3" @@ -1101,14 +1127,150 @@ "Easing Pane" "3" "qmleditorwidgets.qbs:36" "4" "easingpane" "4" +"easingpane.qrc" "5" +"/" "6" +"playicon.png" "7" +"qt_logo.png" "7" +"stopicon.png" "7" "easingcontextpane.cpp" "5" "easingcontextpane.h" "5" "easingcontextpane.ui" "5" "easinggraph.cpp" "5" "easinggraph.h" "5" -"easingpane.qrc" "5" "General" "3" "qmleditorwidgets.qbs:15" "4" +"/qmldesigner" "5" +"images/alignmentbottom-h-icon.png" "6" +"images/alignmentbottom-icon.png" "6" +"images/alignmentcenterh-h-icon.png" "6" +"images/alignmentcenterh-icon.png" "6" +"images/alignmentleft-h-icon.png" "6" +"images/alignmentleft-icon.png" "6" +"images/alignmentmiddle-h-icon.png" "6" +"images/alignmentmiddle-icon.png" "6" +"images/alignmentright-h-icon.png" "6" +"images/alignmentright-icon.png" "6" +"images/alignmenttop-h-icon.png" "6" +"images/alignmenttop-icon.png" "6" +"images/anchor-bottom-normal.png" "6" +"images/anchor-bottom-pressed.png" "6" +"images/anchor-fill-normal.png" "6" +"images/anchor-fill-pressed.png" "6" +"images/anchor-horizontal-normal.png" "6" +"images/anchor-horizontal-pressed.png" "6" +"images/anchor-left-normal.png" "6" +"images/anchor-left-pressed.png" "6" +"images/anchor-right-normal.png" "6" +"images/anchor-right-pressed.png" "6" +"images/anchor-spacer.png" "6" +"images/anchor-top-normal.png" "6" +"images/anchor-top-pressed.png" "6" +"images/anchor-vertical-normal.png" "6" +"images/anchor-vertical-pressed.png" "6" +"images/apply.png" "6" +"images/applybright.png" "6" +"images/aspect-crop-icon.png" "6" +"images/aspect-fit-icon.png" "6" +"images/aspectlockoff.png" "6" +"images/aspectlockset.png" "6" +"images/bold-h-icon.png" "6" +"images/button-normal-left.png" "6" +"images/button-normal-middle.png" "6" +"images/button-normal-right.png" "6" +"images/button-pressed-left.png" "6" +"images/button-pressed-middle.png" "6" +"images/button-pressed-right.png" "6" +"images/button_alignment_bottom_normal.png" "6" +"images/button_alignment_bottom_pressed.png" "6" +"images/button_alignment_centerh_normal.png" "6" +"images/button_alignment_centerh_pressed.png" "6" +"images/button_alignment_centerv_normal.png" "6" +"images/button_alignment_centerv_pressed.png" "6" +"images/button_alignment_left_normal.png" "6" +"images/button_alignment_left_pressed.png" "6" +"images/button_alignment_right_normal.png" "6" +"images/button_alignment_right_pressed.png" "6" +"images/button_alignment_top_normal.png" "6" +"images/button_alignment_top_pressed.png" "6" +"images/button_color_gradient_normal.png" "6" +"images/button_color_gradient_pressed.png" "6" +"images/button_color_none_normal.png" "6" +"images/button_color_none_pressed.png" "6" +"images/button_color_solid_normal.png" "6" +"images/button_color_solid_pressed.png" "6" +"images/cancel.png" "6" +"images/cancelbright.png" "6" +"images/checkbox_checked.png" "6" +"images/checkbox_checked_hover.png" "6" +"images/checkbox_checked_pressed.png" "6" +"images/checkbox_tr_checked.png" "6" +"images/checkbox_tr_checked_hover.png" "6" +"images/checkbox_tr_checked_pressed.png" "6" +"images/checkbox_tr_unchecked.png" "6" +"images/checkbox_tr_unchecked_hover.png" "6" +"images/checkbox_tr_unchecked_pressed.png" "6" +"images/checkbox_unchecked.png" "6" +"images/checkbox_unchecked_hover.png" "6" +"images/checkbox_unchecked_pressed.png" "6" +"images/collapse-button-hover-mirrored.png" "6" +"images/collapse-button-hover.png" "6" +"images/collapse-button-normal-mirrored.png" "6" +"images/collapse-button-normal.png" "6" +"images/combobox-normal.png" "6" +"images/combobox-pressed.png" "6" +"images/down_arrow.png" "6" +"images/down_arrow_disabled.png" "6" +"images/eye_open.png" "6" +"images/frame.png" "6" +"images/hole.png" "6" +"images/horizontal-scale-icon.png" "6" +"images/icon-bottom.png" "6" +"images/icon-horizontal.png" "6" +"images/icon-left.png" "6" +"images/icon-right.png" "6" +"images/icon-top.png" "6" +"images/icon-vertical.png" "6" +"images/icon_color_gradient.png" "6" +"images/icon_color_none.png" "6" +"images/icon_color_solid.png" "6" +"images/italic-h-icon.png" "6" +"images/lock.png" "6" +"images/placeholder.png" "6" +"images/pushbutton.png" "6" +"images/pushbutton_hover.png" "6" +"images/pushbutton_pressed.png" "6" +"images/radiobutton_checked.png" "6" +"images/radiobutton_checked_hover.png" "6" +"images/radiobutton_checked_pressed.png" "6" +"images/radiobutton_unchecked.png" "6" +"images/radiobutton_unchecked_hover.png" "6" +"images/radiobutton_unchecked_pressed.png" "6" +"images/scale-icon.png" "6" +"images/scrollbar-borderimage-horizontal.png" "6" +"images/scrollbar-borderimage-vertical.png" "6" +"images/sizegrip.png" "6" +"images/slider_indikator.png" "6" +"images/slider_line.png" "6" +"images/spindown.png" "6" +"images/spindown_hover.png" "6" +"images/spindown_off.png" "6" +"images/spindown_pressed.png" "6" +"images/spinup.png" "6" +"images/spinup_hover.png" "6" +"images/spinup_off.png" "6" +"images/spinup_pressed.png" "6" +"images/strikeout-h-icon.png" "6" +"images/tile-icon-hor - scale.png" "6" +"images/tile-icon-hor-crop.png" "6" +"images/tile-icon-vert-crop.png" "6" +"images/tile-icon-vert-scale.png" "6" +"images/tile-icon.png" "6" +"images/triangle_horz.png" "6" +"images/triangle_vert.png" "6" +"images/underline-h-icon.png" "6" +"images/up_arrow.png" "6" +"images/up_arrow_disabled.png" "6" +"images/vertical-scale-icon.png" "6" "colorbox.cpp" "4" "colorbox.h" "4" "colorbutton.cpp" "4" @@ -1136,11 +1298,15 @@ "huecontrol.cpp" "4" "huecontrol.h" "4" "qmleditorwidgets_global.h" "4" -"resources.qrc" "4" "QmlJS" "2" "qmljs.qbs:3" "3" "General" "3" "qmljs.qbs:17" "4" +"/qmljs" "5" +"images/element.png" "6" +"images/func.png" "6" +"images/property.png" "6" +"images/publicmember.png" "6" "consoleitem.cpp" "4" "consoleitem.h" "4" "consolemanagerinterface.cpp" "4" @@ -1150,7 +1316,6 @@ "jsoncheck.h" "4" "persistenttrie.cpp" "4" "persistenttrie.h" "4" -"qmljs.qrc" "4" "qmljs_global.h" "4" "qmljsbind.cpp" "4" "qmljsbind.h" "4" @@ -1443,6 +1608,41 @@ "timeline.qbs:32" "4" "qml" "4" "timeline.qrc" "5" +"/timeline" "6" +"arrow_down.png" "7" +"arrow_right.png" "7" +"ButtonsBar.qml" "7" +"CategoryLabel.qml" "7" +"Detail.qml" "7" +"dialog_shadow.png" "7" +"ico_edit.png" "7" +"ico_filter.png" "7" +"ico_next.png" "7" +"ico_note.png" "7" +"ico_prev.png" "7" +"ico_rangeselected.png" "7" +"ico_rangeselection.png" "7" +"ico_selectionmode.png" "7" +"ico_zoom.png" "7" +"lock_closed.png" "7" +"lock_open.png" "7" +"MainView.qml" "7" +"notes.frag" "7" +"notes.vert" "7" +"Overview.qml" "7" +"range_handle.png" "7" +"RangeDetails.qml" "7" +"RangeMover.qml" "7" +"RowLabel.qml" "7" +"SelectionRange.qml" "7" +"SelectionRangeDetails.qml" "7" +"SynchronousReloader.qml" "7" +"TimeDisplay.qml" "7" +"TimelineContent.qml" "7" +"timelineitems.frag" "7" +"timelineitems.vert" "7" +"TimelineLabels.qml" "7" +"TimeMarks.qml" "7" "Utils" "2" "utils.qbs:3" "3" "ConsoleProcess_unix" "3" @@ -1501,6 +1701,21 @@ "progressindicator_small.png" "4" "progressindicator_small@2x.png" "4" "triangle_vert.png" "4" +"/utils" "4" +"images/arrow.png" "5" +"images/crumblepath-segment-end.png" "5" +"images/crumblepath-segment-hover-end.png" "5" +"images/crumblepath-segment-hover.png" "5" +"images/crumblepath-segment-selected-end.png" "5" +"images/crumblepath-segment-selected.png" "5" +"images/crumblepath-segment.png" "5" +"images/progressindicator_big.png" "5" +"images/progressindicator_big@2x.png" "5" +"images/progressindicator_medium.png" "5" +"images/progressindicator_medium@2x.png" "5" +"images/progressindicator_small.png" "5" +"images/progressindicator_small@2x.png" "5" +"images/triangle_vert.png" "5" "algorithm.h" "3" "annotateditemdelegate.cpp" "3" "annotateditemdelegate.h" "3" @@ -1674,7 +1889,6 @@ "uncommentselection.h" "3" "unixutils.cpp" "3" "unixutils.h" "3" -"utils.qrc" "3" "utils_global.h" "3" "winutils.cpp" "3" "winutils.h" "3" @@ -1691,11 +1905,16 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "AnalyzerBase.json.in" "4" +"/" "4" +"images/analyzer_category.png" "5" +"images/analyzer_mode.png" "5" +"images/analyzer_mode@2x.png" "5" +"images/analyzer_start_small.png" "5" +"images/analyzer_stop_small.png" "5" "images" "3" "analyzer_category.png" "4" "analyzer_mode.png" "4" "analyzer_start_small.png" "4" -"analyzerbase.qrc" "3" "analyzerbase_global.h" "3" "analyzerconstants.h" "3" "analyzermanager.cpp" "3" @@ -1723,8 +1942,11 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "Android.json.in" "4" +"/android" "4" +"Android.mimetypes.xml" "5" +"images/download.png" "5" +"images/QtAndroid.png" "5" "addnewavddialog.ui" "3" -"android.qrc" "3" "android_global.h" "3" "androidanalyzesupport.cpp" "3" "androidanalyzesupport.h" "3" @@ -1854,7 +2076,8 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "BareMetal.json.in" "4" -"baremetal.qrc" "3" +"/baremetal" "4" +"images/QtBareMetal.png" "5" "baremetalconstants.h" "3" "baremetalcustomrunconfiguration.cpp" "3" "baremetalcustomrunconfiguration.h" "3" @@ -1975,9 +2198,11 @@ "uncrustifyoptionspage.ui" "5" "uncrustifysettings.cpp" "5" "uncrustifysettings.h" "5" +"/beautifier" "4" +"images/beautifier.png" "5" +"images/beautifier@2x.png" "5" "abstractsettings.cpp" "3" "abstractsettings.h" "3" -"beautifier.qrc" "3" "beautifierabstracttool.h" "3" "beautifierconstants.h" "3" "beautifierplugin.cpp" "3" @@ -2013,11 +2238,12 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "Bookmarks.json.in" "4" +"/bookmarks" "4" +"images/bookmark.png" "5" "bookmark.cpp" "3" "bookmark.h" "3" "bookmarkmanager.cpp" "3" "bookmarkmanager.h" "3" -"bookmarks.qrc" "3" "bookmarks_global.h" "3" "bookmarksplugin.cpp" "3" "bookmarksplugin.h" "3" @@ -2139,7 +2365,8 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "ClassView.json.in" "4" -"classview.qrc" "3" +"/classview" "4" +"images/hierarchicalmode.png" "5" "classviewconstants.h" "3" "classviewmanager.cpp" "3" "classviewmanager.h" "3" @@ -2169,6 +2396,8 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "ClearCase.json.in" "4" +"/clearcase" "4" +"ClearCase.mimetypes.xml" "5" "activityselector.cpp" "3" "activityselector.h" "3" "annotationhighlighter.cpp" "3" @@ -2176,7 +2405,6 @@ "checkoutdialog.cpp" "3" "checkoutdialog.h" "3" "checkoutdialog.ui" "3" -"clearcase.qrc" "3" "clearcaseconstants.h" "3" "clearcasecontrol.cpp" "3" "clearcasecontrol.h" "3" @@ -2207,6 +2435,8 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "CMakeProjectManager.json.in" "4" +"/cmakeproject" "4" +"CMakeProjectManager.mimetypes.xml" "5" "cmake_global.h" "3" "cmakebuildconfiguration.cpp" "3" "cmakebuildconfiguration.h" "3" @@ -2233,7 +2463,6 @@ "cmakeparser.h" "3" "cmakeproject.cpp" "3" "cmakeproject.h" "3" -"cmakeproject.qrc" "3" "cmakeprojectconstants.h" "3" "cmakeprojectmanager.cpp" "3" "cmakeprojectmanager.h" "3" @@ -2266,9 +2495,10 @@ "cgi.h" "5" "splitter.cpp" "5" "splitter.h" "5" +"/cpaster" "4" +"images/category_cpaster.png" "5" "columnindicatortextedit.cpp" "3" "columnindicatortextedit.h" "3" -"cpaster.qrc" "3" "cpasterconstants.h" "3" "cpasterplugin.cpp" "3" "cpasterplugin.h" "3" @@ -2377,11 +2607,18 @@ "Find" "3" "coreplugin.qbs:209" "4" "find" "4" +"find.qrc" "5" +"/find" "6" +"images/casesensitively.png" "7" +"images/expand.png" "7" +"images/preservecase.png" "7" +"images/regexp.png" "7" +"images/wholewords.png" "7" +"images/wrapindicator.png" "7" "basetextfind.cpp" "5" "basetextfind.h" "5" "currentdocumentfind.cpp" "5" "currentdocumentfind.h" "5" -"find.qrc" "5" "finddialog.ui" "5" "findplugin.cpp" "5" "findplugin.h" "5" @@ -2415,11 +2652,130 @@ "textfindconstants.h" "5" "General" "3" "coreplugin.qbs:33" "4" +"/core" "5" +"images/arrowdown.png" "6" +"images/arrowdown@2x.png" "6" +"images/arrowup.png" "6" +"images/arrowup@2x.png" "6" +"images/button_close.png" "6" +"images/button_close@2x.png" "6" +"images/category_core.png" "6" +"images/category_design.png" "6" +"images/category_locator.png" "6" +"images/category_texteditor.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/dark_fileicon.png" "6" +"images/dark_foldericon.png" "6" +"images/dark_magnifier.png" "6" +"images/dark_magnifier@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/Desktop.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/help.png" "6" +"images/info.png" "6" +"images/info@2x.png" "6" +"images/inputfield.png" "6" +"images/inputfield@2x.png" "6" +"images/inputfield_disabled.png" "6" +"images/inputfield_disabled@2x.png" "6" +"images/lightarrowdown.png" "6" +"images/lightarrowdown@2x.png" "6" +"images/lightarrowup.png" "6" +"images/lightarrowup@2x.png" "6" +"images/lightclose.png" "6" +"images/lightclose@2x.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" +"images/panel_button@2x.png" "6" +"images/panel_button_checked.png" "6" +"images/panel_button_checked@2x.png" "6" +"images/panel_button_checked_hover.png" "6" +"images/panel_button_checked_hover@2x.png" "6" +"images/panel_button_hover.png" "6" +"images/panel_button_hover@2x.png" "6" +"images/panel_button_pressed.png" "6" +"images/panel_button_pressed@2x.png" "6" +"images/panel_manage_button.png" "6" +"images/panel_manage_button@2x.png" "6" +"images/pause.png" "6" +"images/plus.png" "6" +"images/prev.png" "6" +"images/progressbar.png" "6" +"images/progressbar@2x.png" "6" +"images/pushbutton.png" "6" +"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/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/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" "5" +"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" "basefilewizard.cpp" "4" "basefilewizard.h" "4" "basefilewizardfactory.cpp" "4" "basefilewizardfactory.h" "4" -"core.qrc" "4" "core_global.h" "4" "coreconstants.h" "4" "corejsextensions.cpp" "4" @@ -2440,7 +2796,6 @@ "externaltoolmanager.h" "4" "fancyactionbar.cpp" "4" "fancyactionbar.h" "4" -"fancyactionbar.qrc" "4" "fancytabwidget.cpp" "4" "fancytabwidget.h" "4" "featureprovider.cpp" "4" @@ -2567,6 +2922,10 @@ "images" "5" "locator.png" "6" "reload.png" "6" +"locator.qrc" "5" +"/locator" "6" +"images/locator.png" "7" +"images/reload.png" "7" "basefilefilter.cpp" "5" "basefilefilter.h" "5" "commandlocator.cpp" "5" @@ -2585,7 +2944,6 @@ "ilocatorfilter.h" "5" "locator.cpp" "5" "locator.h" "5" -"locator.qrc" "5" "locatorconstants.h" "5" "locatorfiltersfilter.cpp" "5" "locatorfiltersfilter.h" "5" @@ -2702,6 +3060,14 @@ "cppuseselections_test.cpp" "4" "fileandtokenactions_test.cpp" "4" "followsymbol_switchmethoddecldef_test.cpp" "4" +"/cppeditor" "4" +"CppEditor.mimetypes.xml" "5" +"images/dark_qt_c.png" "5" +"images/dark_qt_cpp.png" "5" +"images/dark_qt_h.png" "5" +"images/qt_c.png" "5" +"images/qt_cpp.png" "5" +"images/qt_h.png" "5" "cppautocompleter.cpp" "3" "cppautocompleter.h" "3" "cppcanonicalsymbol.cpp" "3" @@ -2713,7 +3079,6 @@ "cppdocumentationcommenthelper.h" "3" "cppeditor.cpp" "3" "cppeditor.h" "3" -"cppeditor.qrc" "3" "cppeditor_global.h" "3" "cppeditorconstants.h" "3" "cppeditordocument.cpp" "3" @@ -2789,6 +3154,8 @@ "modelmanagertesthelper.h" "4" "symbolsearcher_test.cpp" "4" "typehierarchybuilder_test.cpp" "4" +"/cpptools" "4" +"images/category_cpp.png" "5" "abstracteditorsupport.cpp" "3" "abstracteditorsupport.h" "3" "baseeditordocumentparser.cpp" "3" @@ -2879,7 +3246,6 @@ "cppsemanticinfoupdater.h" "3" "cppsourceprocessor.cpp" "3" "cppsourceprocessor.h" "3" -"cpptools.qrc" "3" "cpptools_global.h" "3" "cpptoolsconstants.h" "3" "cpptoolsjsextension.cpp" "3" @@ -2924,9 +3290,10 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "CVS.json.in" "4" +"/trolltech.cvs" "4" +"CVS.mimetypes.xml" "5" "annotationhighlighter.cpp" "3" "annotationhighlighter.h" "3" -"cvs.qrc" "3" "cvsclient.cpp" "3" "cvsclient.h" "3" "cvsconstants.h" "3" @@ -2979,6 +3346,46 @@ "termgdbadapter.h" "5" "General" "3" "debugger.qbs:26" "4" +"/debugger" "5" +"Debugger.mimetypes.xml" "6" +"images/breakpoint_16.png" "6" +"images/breakpoint_24.png" "6" +"images/breakpoint_disabled_16.png" "6" +"images/breakpoint_disabled_24.png" "6" +"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" +"images/debugger_start.png" "6" +"images/debugger_start_small.png" "6" +"images/debugger_stepinto_small.png" "6" +"images/debugger_steponeproc_small.png" "6" +"images/debugger_stepout_small.png" "6" +"images/debugger_stepover_small.png" "6" +"images/debugger_stepoverproc_small.png" "6" +"images/debugger_stop.png" "6" +"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" +"images/qml/select.png" "6" +"images/qml/zoom.png" "6" +"images/tracepoint.png" "6" +"images/watchpoint.png" "6" "breakhandler.cpp" "4" "breakhandler.h" "4" "breakpoint.cpp" "4" @@ -2987,7 +3394,6 @@ "breakwindow.h" "4" "commonoptionspage.cpp" "4" "commonoptionspage.h" "4" -"debugger.qrc" "4" "debugger_global.h" "4" "debuggeractions.cpp" "4" "debuggeractions.h" "4" @@ -3205,9 +3611,10 @@ "formclasswizardparameters.h" "5" "General" "3" "designer.qbs:27" "4" +"/formeditor" "5" +"images/qt_ui.png" "6" "codemodelhelpers.cpp" "4" "codemodelhelpers.h" "4" -"designer.qrc" "4" "designer_export.h" "4" "designerconstants.h" "4" "designercontext.cpp" "4" @@ -3264,9 +3671,15 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "DiffEditor.json.in" "4" +"/diffeditor" "4" +"images/sidebysidediff.png" "5" +"images/sidebysidediff@2x.png" "5" +"images/topbar.png" "5" +"images/topbar@2x.png" "5" +"images/unifieddiff.png" "5" +"images/unifieddiff@2x.png" "5" "diffeditor.cpp" "3" "diffeditor.h" "3" -"diffeditor.qrc" "3" "diffeditor_global.h" "3" "diffeditorconstants.h" "3" "diffeditorcontroller.cpp" "3" @@ -3311,7 +3724,8 @@ "Tests" "3" "fakevim.qbs:30" "4" "fakevim_test.cpp" "4" -"fakevim.qrc" "3" +"/fakevim" "4" +"images/category_fakevim.png" "5" "fakevimactions.cpp" "3" "fakevimactions.h" "3" "fakevimhandler.cpp" "3" @@ -3331,6 +3745,8 @@ "Tests" "3" "genericprojectmanager.qbs:44" "4" "genericprojectplugin_test.cpp" "4" +"/genericproject" "4" +"GenericProjectManager.mimetypes.xml" "5" "filesselectionwizardpage.cpp" "3" "filesselectionwizardpage.h" "3" "genericbuildconfiguration.cpp" "3" @@ -3340,7 +3756,6 @@ "genericmakestep.ui" "3" "genericproject.cpp" "3" "genericproject.h" "3" -"genericproject.qrc" "3" "genericprojectconstants.h" "3" "genericprojectfileseditor.cpp" "3" "genericprojectfileseditor.h" "3" @@ -3378,6 +3793,9 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "Git.json.in" "4" +"/git" "4" +"Git.mimetypes.xml" "5" +"images/arrowup.png" "5" "annotationhighlighter.cpp" "3" "annotationhighlighter.h" "3" "branchadddialog.cpp" "3" @@ -3396,7 +3814,6 @@ "changeselectiondialog.ui" "3" "commitdata.cpp" "3" "commitdata.h" "3" -"git.qrc" "3" "gitclient.cpp" "3" "gitclient.h" "3" "gitconstants.h" "3" @@ -3441,13 +3858,24 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "GLSLEditor.json.in" "4" +"/glsleditor" "4" +"GLSLEditor.mimetypes.xml" "5" +"images/attribute.png" "5" +"images/const.png" "5" +"images/func.png" "5" +"images/glslfile.png" "5" +"images/keyword.png" "5" +"images/other.png" "5" +"images/type.png" "5" +"images/uniform.png" "5" +"images/var.png" "5" +"images/varying.png" "5" "glslautocompleter.cpp" "3" "glslautocompleter.h" "3" "glslcompletionassist.cpp" "3" "glslcompletionassist.h" "3" "glsleditor.cpp" "3" "glsleditor.h" "3" -"glsleditor.qrc" "3" "glsleditorconstants.h" "3" "glsleditorplugin.cpp" "3" "glsleditorplugin.h" "3" @@ -3492,6 +3920,21 @@ "topicchooser.ui" "5" "Sources" "3" "help.qbs:35" "4" +"/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" +"images/mac/addtab.png" "6" +"images/mac/closetab.png" "6" +"images/win/addtab.png" "6" +"images/win/closetab.png" "6" "centralwidget.cpp" "4" "centralwidget.h" "4" "docsettingspage.cpp" "4" @@ -3503,7 +3946,6 @@ "generalsettingspage.cpp" "4" "generalsettingspage.h" "4" "generalsettingspage.ui" "4" -"help.qrc" "4" "helpconstants.h" "4" "helpfindsupport.cpp" "4" "helpfindsupport.h" "4" @@ -3548,11 +3990,20 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "ImageViewer.json.in" "4" +"/imageviewer" "4" +"images/background.png" "5" +"images/fitinscreen.png" "5" +"images/originalsize.png" "5" +"images/outline.png" "5" +"images/pause-small.png" "5" +"images/play-small.png" "5" +"images/zoomin.png" "5" +"images/zoomout.png" "5" +"ImageViewer.mimetypes.xml" "5" "imageview.cpp" "3" "imageview.h" "3" "imageviewer.cpp" "3" "imageviewer.h" "3" -"imageviewer.qrc" "3" "imagevieweractionhandler.cpp" "3" "imagevieweractionhandler.h" "3" "imageviewerconstants.h" "3" @@ -3570,7 +4021,8 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "Ios.json.in" "4" -"ios.qrc" "3" +"/ios" "4" +"images/iossettings.png" "5" "iosanalyzesupport.cpp" "3" "iosanalyzesupport.h" "3" "iosbuildstep.cpp" "3" @@ -3668,6 +4120,8 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "Macros.json.in" "4" +"/macros" "4" +"images/macro.png" "5" "actionmacrohandler.cpp" "3" "actionmacrohandler.h" "3" "findmacrohandler.cpp" "3" @@ -3687,7 +4141,6 @@ "macrooptionswidget.cpp" "3" "macrooptionswidget.h" "3" "macrooptionswidget.ui" "3" -"macros.qrc" "3" "macrosconstants.h" "3" "macrosplugin.cpp" "3" "macrosplugin.h" "3" @@ -3743,6 +4196,8 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "Perforce.json.in" "4" +"/trolltech.perforce" "4" +"Perforce.mimetypes.xml" "5" "annotationhighlighter.cpp" "3" "annotationhighlighter.h" "3" "changenumberdialog.cpp" "3" @@ -3751,7 +4206,6 @@ "pendingchangesdialog.cpp" "3" "pendingchangesdialog.h" "3" "pendingchangesdialog.ui" "3" -"perforce.qrc" "3" "perforcechecker.cpp" "3" "perforcechecker.h" "3" "perforceconstants.h" "3" @@ -3840,6 +4294,57 @@ "sshdeviceprocesslist.h" "5" "General" "3" "projectexplorer.qbs:21" "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/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/lightdisabledbuildstep.png" "6" +"images/lightdisabledbuildstep@2x.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" +"images/Simulator.png" "6" +"images/stop.png" "6" +"images/stop_small.png" "6" +"images/targetbuildselected.png" "6" +"images/targetchangebutton.png" "6" +"images/targetchangebutton2.png" "6" +"images/targetleftbutton.png" "6" +"images/targetpanel_bottom.png" "6" +"images/targetpanel_gradient.png" "6" +"images/targetrightbutton.png" "6" +"images/targetrunselected.png" "6" +"images/targetseparatorbackground.png" "6" +"images/targetunselected.png" "6" +"images/unconfigured.png" "6" +"images/window.png" "6" "abi.cpp" "4" "abi.h" "4" "abiwidget.cpp" "4" @@ -4006,7 +4511,6 @@ "projectconfiguration.h" "4" "projectexplorer.cpp" "4" "projectexplorer.h" "4" -"projectexplorer.qrc" "4" "projectexplorer_export.h" "4" "projectexplorerconstants.h" "4" "projectexplorersettings.h" "4" @@ -4196,12 +4700,13 @@ "pythoneditor.qbs:3" "3" "General" "3" "pythoneditor.qbs:14" "4" +"/pythoneditor" "5" +"PythonEditor.mimetypes.xml" "6" "pythoneditor.cpp" "4" "pythoneditor.h" "4" "pythoneditorconstants.h" "4" "pythoneditorplugin.cpp" "4" "pythoneditorplugin.h" "4" -"pythoneditorplugin.qrc" "4" "MimeTypes" "3" "QtcPlugin.qbs:47" "4" "PythonEditor.mimetypes.xml" "4" @@ -4227,6 +4732,11 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "QbsProjectManager.json.in" "4" +"/qbsprojectmanager" "4" +"images/groups.png" "5" +"images/groups@2x.png" "5" +"images/productgear.png" "5" +"images/productgear@2x.png" "5" "customqbspropertiesdialog.cpp" "3" "customqbspropertiesdialog.h" "3" "customqbspropertiesdialog.ui" "3" @@ -4265,7 +4775,6 @@ "qbsprojectfile.h" "3" "qbsprojectmanager.cpp" "3" "qbsprojectmanager.h" "3" -"qbsprojectmanager.qrc" "3" "qbsprojectmanager_global.h" "3" "qbsprojectmanagerconstants.h" "3" "qbsprojectmanagerplugin.cpp" "3" @@ -4330,6 +4839,16 @@ "pluginoptions.h" "5" "General" "3" "qmakeprojectmanager.qbs:21" "4" +"/qmakeprojectmanager" "5" +"images/dark_headers.png" "6" +"images/dark_sources.png" "6" +"images/dark_unknown.png" "6" +"images/headers.png" "6" +"images/run_qmake.png" "6" +"images/run_qmake_small.png" "6" +"images/sources.png" "6" +"images/unknown.png" "6" +"QmakeProjectManager.mimetypes.xml" "6" "addlibrarywizard.cpp" "4" "addlibrarywizard.h" "4" "desktopqmakerunconfiguration.cpp" "4" @@ -4374,7 +4893,6 @@ "qmakeprojectimporter.h" "4" "qmakeprojectmanager.cpp" "4" "qmakeprojectmanager.h" "4" -"qmakeprojectmanager.qrc" "4" "qmakeprojectmanager_global.h" "4" "qmakeprojectmanagerconstants.h" "4" "qmakeprojectmanagerplugin.cpp" "4" @@ -4410,6 +4928,12 @@ "Wizards" "3" "qmakeprojectmanager.qbs:84" "4" "wizards" "4" +"wizards.qrc" "5" +"/wizards" "6" +"images/console.png" "7" +"images/gui.png" "7" +"images/lib.png" "7" +"images/qtquickapp.png" "7" "filespage.cpp" "5" "filespage.h" "5" "guiappwizard.cpp" "5" @@ -4439,7 +4963,6 @@ "testwizardpage.cpp" "5" "testwizardpage.h" "5" "testwizardpage.ui" "5" -"wizards.qrc" "5" "QmlJSEditor" "2" "qmljseditor.qbs:3" "3" "MimeTypes" "3" @@ -4449,6 +4972,8 @@ "QmlJSEditor.json.in" "4" "images" "3" "qmlfile.png" "4" +"/qmljseditor" "4" +"images/qmlfile.png" "5" "qmlexpressionundercursor.cpp" "3" "qmlexpressionundercursor.h" "3" "qmljsautocompleter.cpp" "3" @@ -4462,7 +4987,6 @@ "qmljscomponentnamedialog.ui" "3" "qmljseditor.cpp" "3" "qmljseditor.h" "3" -"qmljseditor.qrc" "3" "qmljseditor_global.h" "3" "qmljseditorconstants.h" "3" "qmljseditordocument.cpp" "3" @@ -4517,6 +5041,12 @@ "Tests" "3" "qmljstools.qbs:66" "4" "qmljstools_test.cpp" "4" +"/qmljstools" "4" +"images/category_qml.png" "5" +"images/collapse.png" "5" +"images/expand.png" "5" +"images/prompt.png" "5" +"QmlJSTools.mimetypes.xml" "5" "qmlconsoleedit.cpp" "3" "qmlconsoleedit.h" "3" "qmlconsoleitemdelegate.cpp" "3" @@ -4554,7 +5084,6 @@ "qmljsrefactoringchanges.h" "3" "qmljssemanticinfo.cpp" "3" "qmljssemanticinfo.h" "3" -"qmljstools.qrc" "3" "qmljstools_global.h" "3" "qmljstoolsconstants.h" "3" "qmljstoolsplugin.cpp" "3" @@ -4627,6 +5156,12 @@ "qmlprofiler.qbs:52" "4" "qml" "4" "qmlprofiler.qrc" "5" +"/qmlprofiler" "6" +"bindingloops.frag" "7" +"bindingloops.vert" "7" +"clean_pane_small.png" "7" +"recordOff.png" "7" +"recordOn.png" "7" "QmlProjectManager" "2" "qmlprojectmanager.qbs:3" "3" "File Format" "3" @@ -4640,9 +5175,12 @@ "qmlprojectitem.h" "5" "General" "3" "qmlprojectmanager.qbs:14" "4" +"/qmlproject" "5" +"images/qmlfolder.png" "6" +"images/qmlproject.png" "6" +"QmlProjectManager.mimetypes.xml" "6" "qmlproject.cpp" "4" "qmlproject.h" "4" -"qmlproject.qrc" "4" "qmlprojectconstants.h" "4" "qmlprojectenvironmentaspect.cpp" "4" "qmlprojectenvironmentaspect.h" "4" @@ -4675,9 +5213,10 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "Qnx.json.in" "4" +"/qnx" "4" +"images/qnx-target.png" "5" "pathchooserdelegate.cpp" "3" "pathchooserdelegate.h" "3" -"qnx.qrc" "3" "qnxabstractrunsupport.cpp" "3" "qnxabstractrunsupport.h" "3" "qnxanalyzesupport.cpp" "3" @@ -4769,13 +5308,25 @@ "winceqtversionfactory.h" "4" "Shared" "3" "qtsupport.qbs:28" "4" +"proparser.qrc" "5" +"/proparser" "6" +"images/append.png" "7" +"images/other.png" "7" +"images/profile.png" "7" +"images/remove.png" "7" +"images/scope.png" "7" +"images/set.png" "7" +"images/value.png" "7" +"proiteminfo.xml" "7" +"/qmake/features" "6" +"spec_post.prf" "7" +"spec_pre.prf" "7" "ioutils.cpp" "5" "ioutils.h" "5" "profileevaluator.cpp" "5" "profileevaluator.h" "5" "proitems.cpp" "5" "proitems.h" "5" -"proparser.qrc" "5" "prowriter.cpp" "5" "prowriter.h" "5" "qmake_global.h" "5" @@ -4794,6 +5345,16 @@ "qml.png" "4" "qt_project.png" "4" "qt_qrc.png" "4" +"/qtsupport" "4" +"images/dark_forms.png" "5" +"images/dark_qml.png" "5" +"images/dark_qt_project.png" "5" +"images/dark_qt_qrc.png" "5" +"images/forms.png" "5" +"images/qml.png" "5" +"images/qt_project.png" "5" +"images/qt_qrc.png" "5" +"QtSupport.mimetypes.xml" "5" "baseqtversion.cpp" "3" "baseqtversion.h" "3" "codegenerator.cpp" "3" @@ -4828,7 +5389,6 @@ "qtoutputformatter.h" "3" "qtparser.cpp" "3" "qtparser.h" "3" -"qtsupport.qrc" "3" "qtsupport_global.h" "3" "qtsupportconstants.h" "3" "qtsupportplugin.cpp" "3" @@ -4853,6 +5413,8 @@ "RemoteLinux.json.in" "4" "images" "3" "embeddedtarget.png" "4" +"/remotelinux" "4" +"images/embeddedtarget.png" "5" "abstractpackagingstep.cpp" "3" "abstractpackagingstep.h" "3" "abstractremotelinuxdeployservice.cpp" "3" @@ -4895,7 +5457,6 @@ "packageuploader.h" "3" "publickeydeploymentdialog.cpp" "3" "publickeydeploymentdialog.h" "3" -"remotelinux.qrc" "3" "remotelinux_constants.h" "3" "remotelinux_export.h" "3" "remotelinuxanalyzesupport.cpp" "3" @@ -4954,8 +5515,10 @@ "resourceeditor.qbs:3" "3" "General" "3" "resourceeditor.qbs:15" "4" +"/resourceeditor" "5" +"images/qt_qrc.png" "6" +"ResourceEditor.mimetypes.xml" "6" "resource_global.h" "4" -"resourceeditor.qrc" "4" "resourceeditorconstants.h" "4" "resourceeditorfactory.cpp" "4" "resourceeditorfactory.h" "4" @@ -4991,12 +5554,13 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "Subversion.json.in" "4" +"/trolltech.subversion" "4" +"Subversion.mimetypes.xml" "5" "annotationhighlighter.cpp" "3" "annotationhighlighter.h" "3" "settingspage.cpp" "3" "settingspage.h" "3" "settingspage.ui" "3" -"subversion.qrc" "3" "subversionclient.cpp" "3" "subversionclient.h" "3" "subversionconstants.h" "3" @@ -5018,11 +5582,12 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "TaskList.json.in" "4" +"/tasklist" "4" +"TaskList.mimetypes.xml" "5" "stopmonitoringhandler.cpp" "3" "stopmonitoringhandler.h" "3" "taskfile.cpp" "3" "taskfile.h" "3" -"tasklist.qrc" "3" "tasklistconstants.h" "3" "tasklistplugin.cpp" "3" "tasklistplugin.h" "3" @@ -5139,6 +5704,12 @@ "Tests" "3" "texteditor.qbs:255" "4" "texteditor_test.cpp" "4" +"/texteditor" "4" +"images/f1.png" "5" +"images/finddirectory.png" "5" +"images/finddocuments.png" "5" +"images/refactormarker.png" "5" +"images/snippet.png" "5" "autocompleter.cpp" "3" "autocompleter.h" "3" "basefilefind.cpp" "3" @@ -5242,7 +5813,6 @@ "textdocumentlayout.h" "3" "texteditor.cpp" "3" "texteditor.h" "3" -"texteditor.qrc" "3" "texteditor_global.h" "3" "texteditor_p.h" "3" "texteditoractionhandler.cpp" "3" @@ -5269,6 +5839,8 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "Todo.json.in" "4" +"/todoplugin" "4" +"images/todo.png" "5" "constants.h" "3" "cpptodoitemsscanner.cpp" "3" "cpptodoitemsscanner.h" "3" @@ -5303,7 +5875,6 @@ "todooutputtreeviewdelegate.h" "3" "todoplugin.cpp" "3" "todoplugin.h" "3" -"todoplugin.qrc" "3" "todoprojectsettingswidget.cpp" "3" "todoprojectsettingswidget.h" "3" "todoprojectsettingswidget.ui" "3" @@ -5441,6 +6012,11 @@ "diff.png" "4" "removesubmitfield.png" "4" "submit.png" "4" +"/vcsbase" "4" +"images/category_vcs.png" "5" +"images/diff.png" "5" +"images/removesubmitfield.png" "5" +"images/submit.png" "5" "wizard" "3" "vcscommandpage.cpp" "4" "vcscommandpage.h" "4" @@ -5478,7 +6054,6 @@ "submitfieldwidget.h" "3" "submitfilemodel.cpp" "3" "submitfilemodel.h" "3" -"vcsbase.qrc" "3" "vcsbase_global.h" "3" "vcsbaseclient.cpp" "3" "vcsbaseclient.h" "3" @@ -5510,7 +6085,9 @@ "PluginMetaData" "3" "QtcPlugin.qbs:41" "4" "Welcome.json.in" "4" -"welcome.qrc" "3" +"/welcome" "4" +"images/mode_welcome.png" "5" +"images/mode_welcome@2x.png" "5" "welcomeplugin.cpp" "3" "welcomeplugin.h" "3" "WinRt" "2" @@ -6029,10 +6606,18 @@ "plugin.qbs" "5" "QtModule.qbs" "5" "QtPlugin.qbs" "5" +"/" "5" +"templates/core.qbs" "6" +"templates/gui.qbs" "6" +"templates/moc.js" "6" +"templates/module.qbs" "6" +"templates/phonon.qbs" "6" +"templates/plugin.qbs" "6" +"templates/QtModule.qbs" "6" +"templates/QtPlugin.qbs" "6" "qtmoduleinfo.cpp" "4" "qtmoduleinfo.h" "4" "qtprofilesetup.cpp" "4" -"templates.qrc" "4" "qbs plugins" "2" "plugins.qbs" "3" "qbs_cpp_scanner" "3" @@ -6640,9 +7225,10 @@ "tst_externaltooltest.cpp" "4" "File search autotest" "2" "filesearch.qbs:3" "3" +"/tst_filesearch" "4" +"testfile.txt" "5" "testfile.txt" "3" "tst_filesearch.cpp" "3" -"tst_filesearch.qrc" "3" "Generic highlighter autotests" "2" "generichighlighter.qbs" "3" "Generic highlighter specific rules autotest" "3"