diff options
author | Eike Ziller <eike.ziller@qt.io> | 2024-01-15 09:36:58 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2024-01-15 09:36:58 +0100 |
commit | a819a2bd9f0181f2b6852081f35ca6cc7af0e715 (patch) | |
tree | b69c34b27c0bdea7186c6c176c7c99e0e10e1840 | |
parent | 0dd9d9a3276432d598c24be125f4c296d11d43e6 (diff) | |
parent | db930b3c61d6a485d255074d01aed4cdce920163 (diff) |
Merge remote-tracking branch 'origin/12.0'
Change-Id: I62eb6d73b3ed59d0dd9760fc1921e353c993c166
-rw-r--r-- | src/plugins/coreplugin/externaltool.cpp | 29 | ||||
-rw-r--r-- | src/plugins/coreplugin/externaltool.h | 5 | ||||
-rw-r--r-- | src/plugins/ios/iosdeploystep.cpp | 2 | ||||
-rw-r--r-- | src/plugins/projectexplorer/customtoolchain.cpp | 1 | ||||
m--------- | src/shared/qbs | 0 | ||||
-rw-r--r-- | tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv | 454 |
6 files changed, 43 insertions, 448 deletions
diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp index c65cfe80882..7328e024dba 100644 --- a/src/plugins/coreplugin/externaltool.cpp +++ b/src/plugins/coreplugin/externaltool.cpp @@ -623,10 +623,8 @@ void ExternalToolRunner::run() } m_process = new Process(this); connect(m_process, &Process::done, this, &ExternalToolRunner::done); - connect(m_process, &Process::readyReadStandardOutput, - this, &ExternalToolRunner::readStandardOutput); - connect(m_process, &Process::readyReadStandardError, - this, &ExternalToolRunner::readStandardError); + m_process->setStdOutLineCallback([this](const QString &s) { readStandardOutput(s); }); + m_process->setStdErrLineCallback([this](const QString &s) { readStandardError(s); }); if (!m_resolvedWorkingDirectory.isEmpty()) m_process->setWorkingDirectory(m_resolvedWorkingDirectory); const CommandLine cmd{m_resolvedExecutable, m_resolvedArguments, CommandLine::Raw}; @@ -665,30 +663,29 @@ void ExternalToolRunner::done() deleteLater(); } -void ExternalToolRunner::readStandardOutput() +static QString stripNewline(const QString &output) +{ + if (output.endsWith('\n')) + return output.chopped(1); + return output; +} + +void ExternalToolRunner::readStandardOutput(const QString &output) { if (m_tool->outputHandling() == ExternalTool::Ignore) return; - const QByteArray data = m_process->readAllRawStandardOutput(); - const QString output = m_outputCodec->toUnicode(data.constData(), - data.length(), - &m_outputCodecState); if (m_tool->outputHandling() == ExternalTool::ShowInPane) - MessageManager::writeSilently(output); + MessageManager::writeSilently(stripNewline(output)); else if (m_tool->outputHandling() == ExternalTool::ReplaceSelection) m_processOutput.append(output); } -void ExternalToolRunner::readStandardError() +void ExternalToolRunner::readStandardError(const QString &output) { if (m_tool->errorHandling() == ExternalTool::Ignore) return; - const QByteArray data = m_process->readAllRawStandardError(); - const QString output = m_outputCodec->toUnicode(data.constData(), - data.length(), - &m_errorCodecState); if (m_tool->errorHandling() == ExternalTool::ShowInPane) - MessageManager::writeSilently(output); + MessageManager::writeSilently(stripNewline(output)); else if (m_tool->errorHandling() == ExternalTool::ReplaceSelection) m_processOutput.append(output); } diff --git a/src/plugins/coreplugin/externaltool.h b/src/plugins/coreplugin/externaltool.h index 15b420f1808..2d26291fc1d 100644 --- a/src/plugins/coreplugin/externaltool.h +++ b/src/plugins/coreplugin/externaltool.h @@ -115,8 +115,8 @@ public: private: void done(); - void readStandardOutput(); - void readStandardError(); + void readStandardOutput(const QString &output); + void readStandardError(const QString &output); void run(); bool resolve(); @@ -128,6 +128,7 @@ private: Utils::FilePath m_resolvedWorkingDirectory; Utils::Environment m_resolvedEnvironment; Utils::Process *m_process; + // TODO remove codec handling, that is done by Process now QTextCodec *m_outputCodec; QTextCodec::ConverterState m_outputCodecState; QTextCodec::ConverterState m_errorCodecState; diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp index 1a37e2d2884..c56937b1cc0 100644 --- a/src/plugins/ios/iosdeploystep.cpp +++ b/src/plugins/ios/iosdeploystep.cpp @@ -336,7 +336,7 @@ bool IosDeployStep::checkProvisioningProfile() return true; const QStringList deviceIds = provisionPlist.value("ProvisionedDevices").toStringList(); - const QString targetId = device->uniqueDeviceID(); + const QString targetId = device->uniqueInternalDeviceId(); for (const QString &deviceId : deviceIds) { if (deviceId == targetId) return true; diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp index 606d40e4d9a..fa3de6feab4 100644 --- a/src/plugins/projectexplorer/customtoolchain.cpp +++ b/src/plugins/projectexplorer/customtoolchain.cpp @@ -305,6 +305,7 @@ bool CustomToolChain::operator ==(const Toolchain &other) const auto customTc = static_cast<const CustomToolChain *>(&other); return m_makeCommand == customTc->m_makeCommand + && compilerCommand() == customTc->compilerCommand() && targetAbi() == customTc->targetAbi() && m_predefinedMacros == customTc->m_predefinedMacros && m_builtInHeaderPaths == customTc->m_builtInHeaderPaths; diff --git a/src/shared/qbs b/src/shared/qbs -Subproject b1d6a0518a38bf37928233d31f764132081f85e +Subproject aa044048f0b3573ddda09d1b7a4483af9eed3de 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 241ce7f8791..15dd125bc7d 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 @@ -623,7 +623,6 @@ "textfinder.pro" "4" "qtdesignstudio" "2" "studiodoc.pro" "3" -"doc.pri" "2" "doc_targets.pri" "2" "share" "1" "qtcreator" "2" @@ -696,47 +695,32 @@ "autogenerated.pri" "6" "data" "5" "data.pro" "6" -"syntax-highlighting.pro" "5" "syntax-highlighting_dependencies.pri" "5" "yaml-cpp" "4" "yaml-cpp.pri" "5" "yaml-cpp.pro" "5" -"yaml-cpp_dependencies.pri" "5" "advanceddockingsystem" "3" "linux" "4" "linux.pri" "5" -"advanceddockingsystem-lib.pri" "4" "advanceddockingsystem.pro" "4" -"advanceddockingsystem_dependencies.pri" "4" "aggregation" "3" "examples" "4" "text" "5" "text.pro" "6" "examples.pro" "5" -"aggregation.pro" "4" "aggregation_dependencies.pri" "4" "clangsupport" "3" -"clangsupport-lib.pri" "4" "clangsupport.pro" "4" -"clangsupport_dependencies.pri" "4" "cplusplus" "3" -"cplusplus-lib.pri" "4" "cplusplus.pro" "4" -"cplusplus_dependencies.pri" "4" "extensionsystem" "3" -"extensionsystem.pro" "4" "extensionsystem_dependencies.pri" "4" "glsl" "3" -"glsl-lib.pri" "4" "glsl.pro" "4" -"glsl_dependencies.pri" "4" "languageserverprotocol" "3" -"languageserverprotocol.pro" "4" "languageserverprotocol_dependencies.pri" "4" "languageutils" "3" -"languageutils-lib.pri" "4" "languageutils.pro" "4" -"languageutils_dependencies.pri" "4" "modelinglib" "3" "qmt" "4" "qmt.pri" "5" @@ -744,24 +728,17 @@ "qstringparser.pri" "5" "qtserialization" "4" "qtserialization.pri" "5" -"modelinglib.pro" "4" "modelinglib_dependencies.pri" "4" "qmldebug" "3" -"qmldebug-lib.pri" "4" "qmldebug.pro" "4" -"qmldebug_dependencies.pri" "4" "qmleditorwidgets" "3" "easingpane" "4" "easingpane.pri" "5" -"qmleditorwidgets-lib.pri" "4" "qmleditorwidgets.pro" "4" -"qmleditorwidgets_dependencies.pri" "4" "qmljs" "3" "parser" "4" "parser.pri" "5" -"qmljs-lib.pri" "4" "qmljs.pro" "4" -"qmljs_dependencies.pri" "4" "qt-breakpad" "3" "qtcrashhandler" "4" "qtcrashhandler.pro" "5" @@ -774,13 +751,9 @@ "sqlite" "3" "sqlite-lib.pri" "4" "sqlite-source.pri" "4" -"sqlite.pro" "4" -"sqlite_dependencies.pri" "4" "ssh" "3" -"ssh.pro" "4" "ssh_dependencies.pri" "4" "tracing" "3" -"tracing.pro" "4" "tracing_dependencies.pri" "4" "utils" "3" "mimetypes" "4" @@ -789,13 +762,10 @@ "touchbar.pri" "5" "process_ctrlc_stub.pro" "4" "process_stub.pro" "4" -"utils-lib.pri" "4" "utils.pro" "4" -"utils_dependencies.pri" "4" "libs.pro" "3" "plugins" "2" "android" "3" -"android.pro" "4" "android_dependencies.pri" "4" "autotest" "3" "unit_test" "4" @@ -850,10 +820,8 @@ "gtest_dependency.pri" "7" "tests.pro" "7" "simple_gt.pro" "6" -"autotest.pro" "4" "autotest_dependencies.pri" "4" "autotoolsprojectmanager" "3" -"autotoolsprojectmanager.pro" "4" "autotoolsprojectmanager_dependencies.pri" "4" "baremetal" "3" "debugservers" "4" @@ -861,24 +829,18 @@ "gdbservers.pri" "6" "uvsc" "5" "uvscservers.pri" "6" -"baremetal.pro" "4" "baremetal_dependencies.pri" "4" "bazaar" "3" -"bazaar.pro" "4" "bazaar_dependencies.pri" "4" "beautifier" "3" -"beautifier.pro" "4" "beautifier_dependencies.pri" "4" "bineditor" "3" -"bineditor.pro" "4" "bineditor_dependencies.pri" "4" "bookmarks" "3" -"bookmarks.pro" "4" "bookmarks_dependencies.pri" "4" "boot2qt" "3" "device-detection" "4" "device-detection.pri" "5" -"boot2qt.pro" "4" "boot2qt_dependencies.pri" "4" "clangcodemodel" "3" "completion" "5" @@ -895,13 +857,10 @@ "qt-widgets-app.pro" "6" "tooltips" "5" "tooltips.pro" "6" -"clangcodemodel.pro" "4" "clangcodemodel_dependencies.pri" "4" "clangcodemodelunittestfiles.pri" "4" "clangformat" "3" -"clangformat-source.pri" "4" "clangformat.pro" "4" -"clangformat_dependencies.pri" "4" "clangtools" "3" "unit-tests" "4" "clangtidy_clazy" "5" @@ -918,49 +877,37 @@ "simple-library.pro" "6" "stdc++11-includes" "5" "stdc++11-includes.pro" "6" -"clangtools.pro" "4" "clangtools_dependencies.pri" "4" "clangtoolsunittestfiles.pri" "4" "classview" "3" -"classview.pro" "4" "classview_dependencies.pri" "4" "clearcase" "3" -"clearcase.pro" "4" "clearcase_dependencies.pri" "4" "cmakeprojectmanager" "3" -"cmakeprojectmanager.pro" "4" "cmakeprojectmanager_dependencies.pri" "4" "compilationdatabaseprojectmanager" "3" -"compilationdatabaseprojectmanager.pro" "4" "compilationdatabaseprojectmanager_dependencies.pri" "4" "conan" "3" -"conan.pro" "4" "conan_dependencies.pri" "4" "coreplugin" "3" "find" "4" "find.pri" "5" "locator" "4" "locator.pri" "5" -"coreplugin.pro" "4" "coreplugin_dependencies.pri" "4" "corepluginunittestfiles.pri" "4" "cpaster" "3" "frontend" "4" "frontend.pro" "5" -"cpaster.pro" "4" "cpaster_dependencies.pri" "4" "cppcheck" "3" -"cppcheck.pro" "4" "cppcheck_dependencies.pri" "4" "cppeditor" "3" -"cppeditor.pro" "4" "cppeditor_dependencies.pri" "4" "cppeditorunittestfiles.pri" "4" "ctfvisualizer" "3" -"ctfvisualizer.pro" "4" "ctfvisualizer_dependencies.pri" "4" "cvs" "3" -"cvs.pro" "4" "cvs_dependencies.pri" "4" "debugger" "3" "analyzer" "4" @@ -982,102 +929,74 @@ "simple.pro" "5" "uvsc" "4" "uvsc.pri" "5" -"debugger.pro" "4" "debugger_dependencies.pri" "4" "debuggerunittestfiles.pri" "4" "ptracepreload.pro" "4" "designer" "3" "cpp" "4" "cpp.pri" "5" -"designer.pro" "4" "designer_dependencies.pri" "4" "diffeditor" "3" -"diffeditor.pro" "4" "diffeditor_dependencies.pri" "4" "docker" "3" -"docker.pro" "4" "docker_dependencies.pri" "4" "emacskeys" "3" -"emacskeys.pro" "4" "emacskeys_dependencies.pri" "4" "fakevim" "3" -"fakevim.pro" "4" "fakevim_dependencies.pri" "4" "genericprojectmanager" "3" -"genericprojectmanager.pro" "4" "genericprojectmanager_dependencies.pri" "4" "git" "3" "gerrit" "4" "gerrit.pri" "5" -"git.pro" "4" "git_dependencies.pri" "4" "glsleditor" "3" -"glsleditor.pro" "4" "glsleditor_dependencies.pri" "4" "helloworld" "3" -"helloworld.pro" "4" "helloworld_dependencies.pri" "4" "help" "3" -"help.pro" "4" "help_dependencies.pri" "4" "imageviewer" "3" -"imageviewer.pro" "4" "imageviewer_dependencies.pri" "4" "incredibuild" "3" -"incredibuild.pro" "4" "incredibuild_dependencies.pri" "4" "ios" "3" -"ios.pro" "4" "ios_dependencies.pri" "4" "languageclient" "3" -"languageclient.pro" "4" "languageclient_dependencies.pri" "4" "macros" "3" -"macros.pro" "4" "macros_dependencies.pri" "4" "marketplace" "3" -"marketplace.pro" "4" "marketplace_dependencies.pri" "4" "mcusupport" "3" -"mcusupport.pro" "4" "mcusupport_dependencies.pri" "4" "mercurial" "3" -"mercurial.pro" "4" "mercurial_dependencies.pri" "4" "mesonprojectmanager" "3" -"mesonprojectmanager.pro" "4" "mesonprojectmanager_dependencies.pri" "4" "modeleditor" "3" -"modeleditor.pro" "4" "modeleditor_dependencies.pri" "4" "nim" "3" -"nim.pro" "4" "nim_dependencies.pri" "4" "perforce" "3" -"perforce.pro" "4" "perforce_dependencies.pri" "4" "perfprofiler" "3" "tests" "4" "tests.pri" "5" -"perfprofiler.pro" "4" "perfprofiler_dependencies.pri" "4" "projectexplorer" "3" "customwizard" "4" "customwizard.pri" "5" "jsonwizard" "4" "jsonwizard.pri" "5" -"projectexplorer.pro" "4" "projectexplorer_dependencies.pri" "4" "python" "3" -"python.pro" "4" "python_dependencies.pri" "4" "qbsprojectmanager" "3" -"qbsprojectmanager.pro" "4" "qbsprojectmanager_dependencies.pri" "4" "qmakeprojectmanager" "3" "customwidgetwizard" "4" "customwidgetwizard.pri" "5" -"qmakeprojectmanager.pro" "4" "qmakeprojectmanager_dependencies.pri" "4" "qmldesigner" "3" "assetexporterplugin" "4" @@ -1143,9 +1062,7 @@ "filemanager" "5" "filemanager.pri" "6" "instances" "5" -"instances-lib.pri" "6" "instances.pri" "6" -"designercore-lib.pri" "5" "designercore.pri" "5" "iwidgetplugin.pri" "5" "qmlpreviewplugin" "4" @@ -1155,45 +1072,35 @@ "qtquickplugin.pri" "5" "qtquickplugin.pro" "5" "plugindestdir.pri" "4" -"qmldesigner.pro" "4" "qmldesigner_dependencies.pri" "4" "qmldesignerplugin.pri" "4" "qmldesignerplugin.pro" "4" "qmldesignerunittestfiles.pri" "4" "qmljseditor" "3" -"qmljseditor.pro" "4" "qmljseditor_dependencies.pri" "4" "qmljstools" "3" -"qmljstools.pro" "4" "qmljstools_dependencies.pri" "4" "qmlpreview" "3" "tests" "4" "tests.pri" "5" -"qmlpreview.pro" "4" "qmlpreview_dependencies.pri" "4" "qmlprofiler" "3" "tests" "4" "tests.pri" "5" -"qmlprofiler.pro" "4" "qmlprofiler_dependencies.pri" "4" "qmlprojectmanager" "3" "fileformat" "4" "fileformat.pri" "5" -"qmlprojectmanager.pro" "4" "qmlprojectmanager_dependencies.pri" "4" "qnx" "3" -"qnx.pro" "4" "qnx_dependencies.pri" "4" "qtsupport" "3" -"qtsupport.pro" "4" "qtsupport_dependencies.pri" "4" "remotelinux" "3" -"remotelinux.pro" "4" "remotelinux_dependencies.pri" "4" "resourceeditor" "3" "qrceditor" "4" "qrceditor.pri" "5" -"resourceeditor.pro" "4" "resourceeditor_dependencies.pri" "4" "scxmleditor" "3" "common" "4" @@ -1202,51 +1109,37 @@ "outputpane.pri" "5" "plugin_interface" "4" "plugin_interface.pri" "5" -"scxmleditor.pro" "4" "scxmleditor_dependencies.pri" "4" "serialterminal" "3" -"serialterminal.pro" "4" "serialterminal_dependencies.pri" "4" "silversearcher" "3" -"silversearcher.pro" "4" "silversearcher_dependencies.pri" "4" "studiowelcome" "3" -"studiowelcome.pro" "4" "studiowelcome_dependencies.pri" "4" "subversion" "3" -"subversion.pro" "4" "subversion_dependencies.pri" "4" "tasklist" "3" -"tasklist.pro" "4" "tasklist_dependencies.pri" "4" "texteditor" "3" -"texteditor.pro" "4" "texteditor_dependencies.pri" "4" "todo" "3" -"todo.pro" "4" "todo_dependencies.pri" "4" "updateinfo" "3" -"updateinfo.pro" "4" "updateinfo_dependencies.pri" "4" "valgrind" "3" "callgrind" "4" "callgrind.pri" "5" "xmlprotocol" "4" "xmlprotocol.pri" "5" -"valgrind.pro" "4" "valgrind_dependencies.pri" "4" "valgrind_test.pri" "4" "vcsbase" "3" -"vcsbase.pro" "4" "vcsbase_dependencies.pri" "4" "webassembly" "3" -"webassembly.pro" "4" "webassembly_dependencies.pri" "4" "welcome" "3" -"welcome.pro" "4" "welcome_dependencies.pri" "4" "winrt" "3" -"winrt.pro" "4" "winrt_dependencies.pri" "4" "plugins.pro" "3" "share" "2" @@ -1608,7 +1501,6 @@ "script" "4" "script.pro" "5" "simple" "4" -"simple.pro" "5" "simple_test_app.pro" "5" "simple_test_plugin.pro" "5" "spacy path" "4" @@ -1691,8 +1583,6 @@ "unit.pro" "3" "tests.pro" "2" "docs.pri" "1" -"qtcreator.pri" "1" -"qtcreator.pro" "1" "qtcreator_ide_branding.pri" "1" "qtcreator_testvars.pri" "1" "qtcreatordata.pri" "1" @@ -1704,7 +1594,6 @@ "SourceCodePro-Bold.ttf" "3" "SourceCodePro-It.ttf" "3" "SourceCodePro-Regular.ttf" "3" -"SourceCodePro.txt" "3" "package-manager" "2" "auto-setup.cmake" "3" "conan.cmake" "3" @@ -1749,39 +1638,12 @@ "glsl" "2" "glsl_120.frag" "3" "glsl_120.vert" "3" -"glsl_120_common.glsl" "3" "glsl_330.frag" "3" "glsl_330.vert" "3" -"glsl_330_common.glsl" "3" "glsl_es_100.frag" "3" "glsl_es_100.vert" "3" -"glsl_es_100_common.glsl" "3" "modeleditor" "2" "standard.def" "3" -"qml-type-descriptions" "2" -"builtins.qmltypes" "3" -"qbs-base.qmltypes" "3" -"qmlproject-bundle.json" "3" -"qmlproject.qmltypes" "3" -"qmlruntime.qmltypes" "3" -"qmltypes-bundle.json" "3" -"qt-labs-folderlistmodel.qmltypes" "3" -"qt-labs-gestures.qmltypes" "3" -"qt-labs-particles.qmltypes" "3" -"qt5QtQuick2-bundle.json" "3" -"qtmobility-connectivity.qmltypes" "3" -"qtmobility-contacts.qmltypes" "3" -"qtmobility-feedback.qmltypes" "3" -"qtmobility-gallery.qmltypes" "3" -"qtmobility-location.qmltypes" "3" -"qtmobility-messaging.qmltypes" "3" -"qtmobility-organizer.qmltypes" "3" -"qtmobility-publishsubscribe.qmltypes" "3" -"qtmobility-sensors.qmltypes" "3" -"qtmobility-serviceframework.qmltypes" "3" -"qtmobility-systeminfo.qmltypes" "3" -"qtmultimediakit.qmltypes" "3" -"qtwebkit.qmltypes" "3" "commands" "3" "captureddatacommand.h" "4" "changeauxiliarycommand.cpp" "4" @@ -1876,7 +1738,6 @@ "propertyvaluecontainer.h" "4" "reparentcontainer.cpp" "4" "reparentcontainer.h" "4" -"sharedmemory.h" "4" "sharedmemory_qt.cpp" "4" "sharedmemory_unix.cpp" "4" "html" "3" @@ -2001,7 +1862,6 @@ "qml2puppet" "3" "editor3d" "4" "qt5compat" "5" -"qquick3darealight.cpp" "6" "qquick3darealight_p.h" "6" "camerageometry.cpp" "5" "camerageometry.h" "5" @@ -2107,13 +1967,11 @@ "qmlprivategate.cpp" "4" "qmlprivategate.h" "4" "qmlprivategate.pri" "4" -"qmlprivategate_56.cpp" "4" "types" "3" "enumeration.h" "4" "types.pri" "4" "editor3d_qt5.qrc" "3" "editor3d_qt6.qrc" "3" -"qmlpuppet.qrc" "3" "qmlpuppet_utilities.pri" "3" "qmldesigner" "2" "itemLibraryQmlSources" "3" @@ -2168,7 +2026,6 @@ "down-arrow@2x.png" "7" "expression.png" "7" "expression@2x.png" "7" -"icon-gradient-list.png" "7" "icon_color_conical_gradient.png" "7" "icon_color_gradient.png" "7" "icon_color_none.png" "7" @@ -2462,7 +2319,6 @@ "GridView.png" "4" "Image.png" "4" "InfoBanner.png" "4" -"item-icon16.png" "4" "Item.png" "4" "ListButton.png" "4" "ListDelegate.png" "4" @@ -2510,7 +2366,6 @@ "styles" "2" "creator-dark.xml" "3" "dark.xml" "3" -"default.xml" "3" "default_classic.xml" "3" "grayscale.xml" "3" "inkpot.xml" "3" @@ -2525,8 +2380,6 @@ "tpl_resources.qrc" "4" "tpl_single.cpp" "4" "tpl_single.h" "4" -"tpl_widget.cpp" "4" -"tpl_widget.h" "4" "tpl_widget_include.pri" "4" "tpl_widget_lib.pro" "4" "wizards" "3" @@ -2535,12 +2388,8 @@ "catch2_tst.cpp" "6" "googlecommon.js" "6" "gtest_dependency.pri" "6" -"tst.pro" "6" -"tst.qbs" "6" -"tst.txt" "6" "tst_main.cpp" "6" "tst_qml.tmpl" "6" -"tst_src.cpp" "6" "tst_src_gt.cpp" "6" "autotest.png" "5" "autotest@2x.png" "5" @@ -2652,7 +2501,6 @@ "CMakeLists.txt" "6" "lib.cpp" "6" "lib.h" "6" -"lib_global.h" "6" "meson.build" "6" "project.json" "6" "project.pro" "6" @@ -2721,7 +2569,6 @@ "widget" "6" "main.pyproject" "7" "wizard.json" "7" -"main.pyproject" "6" "main_empty.py" "6" "main_mainwindow.py" "6" "main_qtquick.py" "6" @@ -2795,7 +2642,6 @@ "myplugin.cpp" "5" "myplugin.h" "5" "MyPlugin.json.in" "5" -"myplugin_global.h" "5" "mypluginconstants.h" "5" "qtcreatorplugin.png" "5" "qtcreatorplugin@2x.png" "5" @@ -2805,11 +2651,9 @@ "themes" "2" "dark.creatortheme" "3" "default.creatortheme" "3" -"design-light.creatortheme" "3" "design.creatortheme" "3" "flat-dark.creatortheme" "3" "flat-light.creatortheme" "3" -"flat.creatortheme" "3" "Sources" "0" "src.qbs:6" "1" "app_version_header" "1" @@ -3054,7 +2898,6 @@ "pp-engine.h" "5" "pp-scanner.cpp" "5" "pp-scanner.h" "5" -"pp.h" "5" "PPToken.cpp" "5" "PPToken.h" "5" "PreprocessorClient.cpp" "5" @@ -3165,7 +3008,6 @@ "invoker.h" "4" "iplugin.cpp" "4" "iplugin.h" "4" -"iplugin_p.h" "4" "optionsparser.cpp" "4" "optionsparser.h" "4" "plugindetailsview.cpp" "4" @@ -3179,10 +3021,8 @@ "pluginerrorview.ui" "4" "pluginmanager.cpp" "4" "pluginmanager.h" "4" -"pluginmanager_p.h" "4" "pluginspec.cpp" "4" "pluginspec.h" "4" -"pluginspec_p.h" "4" "pluginview.cpp" "4" "pluginview.h" "4" "GLSL" "2" @@ -3191,7 +3031,6 @@ "glsl.qbs:45" "4" "glslparser.cpp" "4" "glslparser.h" "4" -"glslparsertable.cpp" "4" "glslparsertable_p.h" "4" "Group 4" "3" "glsl.qbs:56" "4" @@ -3682,7 +3521,6 @@ "qxmlinarchive.h" "5" "qxmloutarchive.h" "5" "reference.h" "5" -"serialize.h" "5" "serialize_basic.h" "5" "serialize_container.h" "5" "serialize_enum.h" "5" @@ -3842,7 +3680,6 @@ "tile-icon-hor-scale.png" "7" "tile-icon-vert-crop.png" "7" "tile-icon-vert-scale.png" "7" -"tile-icon.png" "7" "tr.png" "7" "tr@2x.png" "7" "underline-h-icon.png" "7" @@ -3931,25 +3768,18 @@ "qmljsviewercontext.h" "5" "Parser" "4" "qmljs.qbs:58" "5" -"qmldirparser.cpp" "5" "qmldirparser_p.h" "5" -"qmlimportresolver.cpp" "5" "qmlimportresolver_p.h" "5" -"qmljsast.cpp" "5" "qmljsast_p.h" "5" "qmljsastfwd_p.h" "5" -"qmljsastvisitor.cpp" "5" "qmljsastvisitor_p.h" "5" "qmljsengine_p.cpp" "5" "qmljsengine_p.h" "5" "qmljsglobal_p.h" "5" -"qmljsgrammar.cpp" "5" "qmljsgrammar_p.h" "5" "qmljskeywords_p.h" "5" -"qmljslexer.cpp" "5" "qmljslexer_p.h" "5" "qmljsmemorypool_p.h" "5" -"qmljsparser.cpp" "5" "qmljsparser_p.h" "5" "qmljssourcelocation_p.h" "5" "standard pch file (gui)" "4" @@ -4059,7 +3889,6 @@ "sshkeycreationdialog.cpp" "4" "sshkeycreationdialog.h" "4" "sshkeycreationdialog.ui" "4" -"sshlogging.cpp" "4" "sshlogging_p.h" "4" "sshprocess.cpp" "4" "sshprocess.h" "4" @@ -4147,8 +3976,8 @@ "licenses" "6" "LICENSE.GPLv2" "7" "LICENSE.GPLv3" "7" -"LICENSE.LGPLv21" "7" "LICENSE.LGPLv3" "7" +"LICENSE.LGPLv21" "7" "alert.xml" "6" "autoconf.xml" "6" "bash.xml" "6" @@ -4178,14 +4007,10 @@ "syntax-highlighting.qbs:43" "5" "abstracthighlighter.cpp" "5" "abstracthighlighter.h" "5" -"abstracthighlighter_p.h" "5" -"context.cpp" "5" "context_p.h" "5" -"contextswitch.cpp" "5" "contextswitch_p.h" "5" "definition.cpp" "5" "definition.h" "5" -"definition_p.h" "5" "definitiondownloader.cpp" "5" "definitiondownloader.h" "5" "definitionref_p.h" "5" @@ -4193,30 +4018,22 @@ "foldingregion.h" "5" "format.cpp" "5" "format.h" "5" -"format_p.h" "5" "htmlhighlighter.cpp" "5" "htmlhighlighter.h" "5" -"keywordlist.cpp" "5" "keywordlist_p.h" "5" "matchresult_p.h" "5" "repository.cpp" "5" "repository.h" "5" -"repository_p.h" "5" -"rule.cpp" "5" "rule_p.h" "5" "state.cpp" "5" "state.h" "5" -"state_p.h" "5" "syntaxhighlighter.cpp" "5" "syntaxhighlighter.h" "5" "textstyledata_p.h" "5" "theme.cpp" "5" "theme.h" "5" -"themedata.cpp" "5" "themedata_p.h" "5" -"wildcardmatcher.cpp" "5" "wildcardmatcher_p.h" "5" -"worddelimiters.cpp" "5" "worddelimiters_p.h" "5" "xml_p.h" "5" "standard pch file (gui)" "4" @@ -4265,32 +4082,26 @@ "safecastable.h" "5" "timelineabstractrenderer.cpp" "5" "timelineabstractrenderer.h" "5" -"timelineabstractrenderer_p.h" "5" "timelineformattime.cpp" "5" "timelineformattime.h" "5" "timelineitemsrenderpass.cpp" "5" "timelineitemsrenderpass.h" "5" "timelinemodel.cpp" "5" "timelinemodel.h" "5" -"timelinemodel_p.h" "5" "timelinemodelaggregator.cpp" "5" "timelinemodelaggregator.h" "5" "timelinenotesmodel.cpp" "5" "timelinenotesmodel.h" "5" -"timelinenotesmodel_p.h" "5" "timelinenotesrenderpass.cpp" "5" "timelinenotesrenderpass.h" "5" "timelineoverviewrenderer.cpp" "5" "timelineoverviewrenderer.h" "5" -"timelineoverviewrenderer_p.h" "5" "timelinerenderer.cpp" "5" "timelinerenderer.h" "5" -"timelinerenderer_p.h" "5" "timelinerenderpass.cpp" "5" "timelinerenderpass.h" "5" "timelinerenderstate.cpp" "5" "timelinerenderstate.h" "5" -"timelinerenderstate_p.h" "5" "timelineselectionrenderpass.cpp" "5" "timelineselectionrenderpass.h" "5" "timelinetheme.cpp" "5" @@ -4364,19 +4175,12 @@ "utils.qbs:379" "5" "mimedatabase.cpp" "5" "mimedatabase.h" "5" -"mimedatabase_p.h" "5" -"mimeglobpattern.cpp" "5" "mimeglobpattern_p.h" "5" -"mimemagicrule.cpp" "5" "mimemagicrule_p.h" "5" -"mimemagicrulematcher.cpp" "5" "mimemagicrulematcher_p.h" "5" -"mimeprovider.cpp" "5" "mimeprovider_p.h" "5" "mimetype.cpp" "5" "mimetype.h" "5" -"mimetype_p.h" "5" -"mimetypeparser.cpp" "5" "mimetypeparser_p.h" "5" "ProcessHandle_macos" "4" "utils.qbs:371" "5" @@ -4393,7 +4197,6 @@ "utils.qbs:332" "5" "theme.cpp" "5" "theme.h" "5" -"theme_p.h" "5" "Theme_macos" "4" "utils.qbs:362" "5" "theme_mac.h" "5" @@ -4407,9 +4210,7 @@ "tooltip.h" "5" "TouchBar implementation" "4" "utils.qbs:406" "5" -"touchbar_appdelegate_mac.mm" "5" "touchbar_appdelegate_mac_p.h" "5" -"touchbar_mac.mm" "5" "touchbar_mac_p.h" "5" "TouchBar stub" "4" "utils.qbs:416" "5" @@ -4459,20 +4260,12 @@ "collapse@2x.png" "5" "compile_error_taskbar.png" "5" "compile_error_taskbar@2x.png" "5" -"crumblepath-segment-first-hover.png" "5" -"crumblepath-segment-first-hover@2x.png" "5" "crumblepath-segment-first.png" "5" "crumblepath-segment-first@2x.png" "5" -"crumblepath-segment-last-hover.png" "5" -"crumblepath-segment-last-hover@2x.png" "5" "crumblepath-segment-last.png" "5" "crumblepath-segment-last@2x.png" "5" -"crumblepath-segment-middle-hover.png" "5" -"crumblepath-segment-middle-hover@2x.png" "5" "crumblepath-segment-middle.png" "5" "crumblepath-segment-middle@2x.png" "5" -"crumblepath-segment-single-hover.png" "5" -"crumblepath-segment-single-hover@2x.png" "5" "crumblepath-segment-single.png" "5" "crumblepath-segment-single@2x.png" "5" "dark_fileicon.png" "5" @@ -4525,26 +4318,18 @@ "fittoview@2x.png" "5" "home.png" "5" "home@2x.png" "5" -"iconoverlay_add.png" "5" -"iconoverlay_add@2x.png" "5" "iconoverlay_add_background.png" "5" "iconoverlay_add_background@2x.png" "5" "iconoverlay_add_small.png" "5" "iconoverlay_add_small@2x.png" "5" -"iconoverlay_error.png" "5" -"iconoverlay_error@2x.png" "5" "iconoverlay_error_background.png" "5" "iconoverlay_error_background@2x.png" "5" "iconoverlay_reset.png" "5" "iconoverlay_reset@2x.png" "5" -"iconoverlay_warning.png" "5" -"iconoverlay_warning@2x.png" "5" "iconoverlay_warning_background.png" "5" "iconoverlay_warning_background@2x.png" "5" "info.png" "5" "info@2x.png" "5" -"inputfield.png" "5" -"inputfield@2x.png" "5" "inputfield_disabled.png" "5" "inputfield_disabled@2x.png" "5" "interrupt_small.png" "5" @@ -4585,10 +4370,6 @@ "online@2x.png" "5" "pan.png" "5" "pan@2x.png" "5" -"panel_button.png" "5" -"panel_button@2x.png" "5" -"panel_button_checked.png" "5" -"panel_button_checked@2x.png" "5" "panel_button_checked_hover.png" "5" "panel_button_checked_hover@2x.png" "5" "panel_button_hover.png" "5" @@ -5042,20 +4823,12 @@ "collapse@2x.png" "7" "compile_error_taskbar.png" "7" "compile_error_taskbar@2x.png" "7" -"crumblepath-segment-first-hover.png" "7" -"crumblepath-segment-first-hover@2x.png" "7" "crumblepath-segment-first.png" "7" "crumblepath-segment-first@2x.png" "7" -"crumblepath-segment-last-hover.png" "7" -"crumblepath-segment-last-hover@2x.png" "7" "crumblepath-segment-last.png" "7" "crumblepath-segment-last@2x.png" "7" -"crumblepath-segment-middle-hover.png" "7" -"crumblepath-segment-middle-hover@2x.png" "7" "crumblepath-segment-middle.png" "7" "crumblepath-segment-middle@2x.png" "7" -"crumblepath-segment-single-hover.png" "7" -"crumblepath-segment-single-hover@2x.png" "7" "crumblepath-segment-single.png" "7" "crumblepath-segment-single@2x.png" "7" "dark_fileicon.png" "7" @@ -5104,26 +4877,18 @@ "fittoview@2x.png" "7" "home.png" "7" "home@2x.png" "7" -"iconoverlay_add.png" "7" -"iconoverlay_add@2x.png" "7" "iconoverlay_add_background.png" "7" "iconoverlay_add_background@2x.png" "7" "iconoverlay_add_small.png" "7" "iconoverlay_add_small@2x.png" "7" -"iconoverlay_error.png" "7" -"iconoverlay_error@2x.png" "7" "iconoverlay_error_background.png" "7" "iconoverlay_error_background@2x.png" "7" "iconoverlay_reset.png" "7" "iconoverlay_reset@2x.png" "7" -"iconoverlay_warning.png" "7" -"iconoverlay_warning@2x.png" "7" "iconoverlay_warning_background.png" "7" "iconoverlay_warning_background@2x.png" "7" "info.png" "7" "info@2x.png" "7" -"inputfield.png" "7" -"inputfield@2x.png" "7" "inputfield_disabled.png" "7" "inputfield_disabled@2x.png" "7" "interrupt_small.png" "7" @@ -5158,10 +4923,6 @@ "online@2x.png" "7" "pan.png" "7" "pan@2x.png" "7" -"panel_button.png" "7" -"panel_button@2x.png" "7" -"panel_button_checked.png" "7" -"panel_button_checked@2x.png" "7" "panel_button_checked_hover.png" "7" "panel_button_checked_hover@2x.png" "7" "panel_button_hover.png" "7" @@ -5252,7 +5013,6 @@ "mimetypes" "6" "freedesktop.org.xml" "7" "f1.png" "7" -"utils_global.h" "4" "utilsicons.cpp" "4" "utilsicons.h" "4" "variablechooser.cpp" "4" @@ -5280,10 +5040,8 @@ "detail" "6" "bool_type.h" "7" "impl.h" "7" -"iterator.h" "7" "iterator_fwd.h" "7" "memory.h" "7" -"node.h" "7" "node_data.h" "7" "node_iterator.h" "7" "node_ref.h" "7" @@ -5333,7 +5091,6 @@ "exp.h" "5" "indentation.h" "5" "memory.cpp" "5" -"node.cpp" "5" "node_data.cpp" "5" "nodebuilder.cpp" "5" "nodebuilder.h" "5" @@ -5390,7 +5147,6 @@ "androiddevice@2x.png" "7" "androiddevicesmall.png" "7" "androiddevicesmall@2x.png" "7" -"android_global.h" "4" "androidavdmanager.cpp" "4" "androidavdmanager.h" "4" "androidbuildapkstep.cpp" "4" @@ -5461,7 +5217,6 @@ "androidsdkpackage.h" "4" "androidservicewidget.cpp" "4" "androidservicewidget.h" "4" -"androidservicewidget_p.h" "4" "androidsettingswidget.cpp" "4" "androidsettingswidget.h" "4" "androidsettingswidget.ui" "4" @@ -5758,7 +5513,6 @@ "text@2x.png" "6" "visual.png" "6" "visual@2x.png" "6" -"autotest_global.h" "3" "autotestconstants.h" "3" "autotesticons.h" "3" "autotestplugin.cpp" "3" @@ -6116,7 +5870,6 @@ "qdbdevice@2x.png" "7" "qdbdevicesmall.png" "7" "qdbdevicesmall@2x.png" "7" -"qdb_global.h" "4" "qdbconstants.h" "4" "qdbdeployconfigurationfactory.cpp" "4" "qdbdeployconfigurationfactory.h" "4" @@ -6714,13 +6467,10 @@ "coreplugin.qbs:179" "5" "actioncontainer.cpp" "5" "actioncontainer.h" "5" -"actioncontainer_p.h" "5" "actionmanager.cpp" "5" "actionmanager.h" "5" -"actionmanager_p.h" "5" "command.cpp" "5" "command.h" "5" -"command_p.h" "5" "commandbutton.cpp" "5" "commandbutton.h" "5" "commandmappings.cpp" "5" @@ -6768,12 +6518,10 @@ "coreplugin.qbs:213" "5" "documentmodel.cpp" "5" "documentmodel.h" "5" -"documentmodel_p.h" "5" "editorarea.cpp" "5" "editorarea.h" "5" "editormanager.cpp" "5" "editormanager.h" "5" -"editormanager_p.h" "5" "editorview.cpp" "5" "editorview.h" "5" "editorwindow.cpp" "5" @@ -6782,7 +6530,6 @@ "ieditor.h" "5" "ieditorfactory.cpp" "5" "ieditorfactory.h" "5" -"ieditorfactory_p.h" "5" "iexternaleditor.cpp" "5" "iexternaleditor.h" "5" "openeditorsview.cpp" "5" @@ -6861,7 +6608,6 @@ "settingscategory_core@2x.png" "8" "settingscategory_design.png" "8" "settingscategory_design@2x.png" "8" -"core_global.h" "5" "coreconstants.h" "5" "coreicons.cpp" "5" "coreicons.h" "5" @@ -6888,12 +6634,8 @@ "fancyactionbar.qrc" "5" "/fancyactionbar" "6" "images" "7" -"mode_Design.png" "8" -"mode_Design@2x.png" "8" "mode_design_mask.png" "8" "mode_design_mask@2x.png" "8" -"mode_Edit.png" "8" -"mode_Edit@2x.png" "8" "mode_edit_mask.png" "8" "mode_edit_mask@2x.png" "8" "fancytabwidget.cpp" "5" @@ -6915,7 +6657,6 @@ "helpitem.h" "5" "helpmanager.cpp" "5" "helpmanager.h" "5" -"helpmanager_implementation.h" "5" "icontext.cpp" "5" "icontext.h" "5" "icore.cpp" "5" @@ -7060,7 +6801,6 @@ "progressbar.h" "5" "progressmanager.cpp" "5" "progressmanager.h" "5" -"progressmanager_p.h" "5" "progressview.cpp" "5" "progressview.h" "5" "ProgressManager_mac" "4" @@ -7292,7 +7032,6 @@ "qt_c.png" "6" "qt_cpp.png" "6" "qt_h.png" "6" -"cppeditor_global.h" "3" "cppeditorconstants.h" "3" "cppeditordocument.cpp" "3" "cppeditordocument.h" "3" @@ -7575,21 +7314,15 @@ "breakpoint_pending_overlay.png" "8" "breakpoint_pending_overlay@2x.png" "8" "debugger_breakpoints.png" "8" -"debugger_continue.png" "8" -"debugger_continue@2x.png" "8" "debugger_continue_1_mask.png" "8" "debugger_continue_1_mask@2x.png" "8" "debugger_continue_2_mask.png" "8" "debugger_continue_2_mask@2x.png" "8" "debugger_empty_14.png" "8" -"debugger_interrupt.png" "8" -"debugger_interrupt@2x.png" "8" "debugger_interrupt_mask.png" "8" "debugger_interrupt_mask@2x.png" "8" "debugger_restart_small.png" "8" "debugger_restart_small@2x.png" "8" -"debugger_reversemode.png" "8" -"debugger_reversemode@2x.png" "8" "debugger_reversemode_background.png" "8" "debugger_reversemode_background@2x.png" "8" "debugger_singleinstructionmode.png" "8" @@ -7600,16 +7333,10 @@ "debugger_stepout_small@2x.png" "8" "debugger_stepover_small.png" "8" "debugger_stepover_small@2x.png" "8" -"debugger_stop.png" "8" -"debugger_stop@2x.png" "8" "debugger_stop_mask.png" "8" "debugger_stop_mask@2x.png" "8" -"location.png" "8" -"location@2x.png" "8" "location_background.png" "8" "location_background@2x.png" "8" -"macos_touchbar_debug.png" "8" -"macos_touchbar_debug@2x.png" "8" "macos_touchbar_debug_continue.png" "8" "macos_touchbar_debug_continue@2x.png" "8" "macos_touchbar_debug_exit.png" "8" @@ -7622,8 +7349,6 @@ "macos_touchbar_debug_step_out@2x.png" "8" "macos_touchbar_debug_step_over.png" "8" "macos_touchbar_debug_step_over@2x.png" "8" -"mode_debug.png" "8" -"mode_debug@2x.png" "8" "mode_debug_mask.png" "8" "mode_debug_mask@2x.png" "8" "pin.xpm" "8" @@ -7635,7 +7360,6 @@ "settingscategory_debugger@2x.png" "8" "tracepointoverlay.png" "8" "tracepointoverlay@2x.png" "8" -"debugger_global.h" "5" "debuggeractions.cpp" "5" "debuggeractions.h" "5" "debuggerconstants.h" "5" @@ -7731,21 +7455,15 @@ "breakpoint_pending_overlay.png" "5" "breakpoint_pending_overlay@2x.png" "5" "debugger_breakpoints.png" "5" -"debugger_continue.png" "5" -"debugger_continue@2x.png" "5" "debugger_continue_1_mask.png" "5" "debugger_continue_1_mask@2x.png" "5" "debugger_continue_2_mask.png" "5" "debugger_continue_2_mask@2x.png" "5" "debugger_empty_14.png" "5" -"debugger_interrupt.png" "5" -"debugger_interrupt@2x.png" "5" "debugger_interrupt_mask.png" "5" "debugger_interrupt_mask@2x.png" "5" "debugger_restart_small.png" "5" "debugger_restart_small@2x.png" "5" -"debugger_reversemode.png" "5" -"debugger_reversemode@2x.png" "5" "debugger_reversemode_background.png" "5" "debugger_reversemode_background@2x.png" "5" "debugger_singleinstructionmode.png" "5" @@ -7756,16 +7474,10 @@ "debugger_stepout_small@2x.png" "5" "debugger_stepover_small.png" "5" "debugger_stepover_small@2x.png" "5" -"debugger_stop.png" "5" -"debugger_stop@2x.png" "5" "debugger_stop_mask.png" "5" "debugger_stop_mask@2x.png" "5" -"location.png" "5" -"location@2x.png" "5" "location_background.png" "5" "location_background@2x.png" "5" -"macos_touchbar_debug.png" "5" -"macos_touchbar_debug@2x.png" "5" "macos_touchbar_debug_continue.png" "5" "macos_touchbar_debug_continue@2x.png" "5" "macos_touchbar_debug_exit.png" "5" @@ -7778,8 +7490,6 @@ "macos_touchbar_debug_step_out@2x.png" "5" "macos_touchbar_debug_step_over.png" "5" "macos_touchbar_debug_step_over@2x.png" "5" -"mode_debug.png" "5" -"mode_debug@2x.png" "5" "mode_debug_mask.png" "5" "mode_debug_mask@2x.png" "5" "pin.xpm" "5" @@ -7968,7 +7678,6 @@ "topbar@2x.png" "6" "unifieddiff.png" "6" "unifieddiff@2x.png" "6" -"diffeditor_global.h" "3" "diffeditorconstants.h" "3" "diffeditorcontroller.cpp" "3" "diffeditorcontroller.h" "3" @@ -8270,8 +7979,6 @@ "images" "7" "macos_touchbar_help.png" "8" "macos_touchbar_help@2x.png" "8" -"mode_help.png" "8" -"mode_help@2x.png" "8" "mode_help_mask.png" "8" "mode_help_mask@2x.png" "8" "settingscategory_help.png" "8" @@ -8467,7 +8174,6 @@ "languageclient@2x.png" "6" "settingscategory_languageclient.png" "6" "settingscategory_languageclient@2x.png" "6" -"languageclient_global.h" "3" "languageclientcompletionassist.cpp" "3" "languageclientcompletionassist.h" "3" "languageclientformatter.cpp" "3" @@ -8504,10 +8210,6 @@ "snippet.h" "3" "LogoImages" "2" "logo.qbs:3" "3" -"128x128" "3" -"logo.qbs:42" "4" -"128" "4" -"QtProject-qtcreator.png" "5" "16x16" "3" "logo.qbs:7" "4" "16" "4" @@ -8516,10 +8218,6 @@ "logo.qbs:14" "4" "24" "4" "QtProject-qtcreator.png" "5" -"256x256" "3" -"logo.qbs:49" "4" -"256" "4" -"QtProject-qtcreator.png" "5" "32x32" "3" "logo.qbs:21" "4" "32" "4" @@ -8528,14 +8226,22 @@ "logo.qbs:28" "4" "48" "4" "QtProject-qtcreator.png" "5" -"512x512" "3" -"logo.qbs:56" "4" -"512" "4" -"QtProject-qtcreator.png" "5" "64x64" "3" "logo.qbs:35" "4" "64" "4" "QtProject-qtcreator.png" "5" +"128x128" "3" +"logo.qbs:42" "4" +"128" "4" +"QtProject-qtcreator.png" "5" +"256x256" "3" +"logo.qbs:49" "4" +"256" "4" +"QtProject-qtcreator.png" "5" +"512x512" "3" +"logo.qbs:56" "4" +"512" "4" +"QtProject-qtcreator.png" "5" "Macros" "2" "macros.qbs:3" "3" "PluginMetaData" "3" @@ -8628,7 +8334,6 @@ "wizard.json" "7" "icon.png" "6" "icon@2x.png" "6" -"mcusupport_global.h" "3" "mcusupportcmakemapper.cpp" "3" "mcusupportcmakemapper.h" "3" "mcusupportconstants.h" "3" @@ -8910,8 +8615,6 @@ "jsextension.h" "3" "modeldocument.cpp" "3" "modeldocument.h" "3" -"modeleditor.cpp" "3" -"modeleditor.h" "3" "modeleditor_constants.h" "3" "modeleditor_global.h" "3" "modeleditor_plugin.cpp" "3" @@ -9107,7 +8810,6 @@ "tracepoints.sh" "5" "/QtCreator/PerfProfiler" "4" "PerfProfilerFlameGraphView.qml" "5" -"perfprofiler_global.h" "3" "perfprofilerconstants.h" "3" "perfprofilerflamegraphmodel.cpp" "3" "perfprofilerflamegraphmodel.h" "3" @@ -9381,8 +9083,6 @@ "images" "7" "analyzer_overlay_small.png" "8" "analyzer_overlay_small@2x.png" "8" -"build.png" "8" -"build@2x.png" "8" "build_hammerhandle_mask.png" "8" "build_hammerhandle_mask@2x.png" "8" "build_hammerhead_mask.png" "8" @@ -9444,8 +9144,6 @@ "fileoverlay_unknown@2x.png" "8" "importasproject.png" "8" "importasproject@2x.png" "8" -"mode_project.png" "8" -"mode_project@2x.png" "8" "mode_project_mask.png" "8" "mode_project_mask@2x.png" "8" "ProjectDependencies.png" "8" @@ -9453,8 +9151,6 @@ "rebuildhammerhandles@2x.png" "8" "rebuildhammerheads.png" "8" "rebuildhammerheads@2x.png" "8" -"run.png" "8" -"run@2x.png" "8" "run_mask.png" "8" "run_mask@2x.png" "8" "RunSettings.png" "8" @@ -9469,7 +9165,6 @@ "targetpanel_bottom.png" "8" "unconfigured.png" "8" "window.png" "8" -"projectexplorer_export.h" "5" "projectexplorerconstants.cpp" "5" "projectexplorerconstants.h" "5" "projectexplorericons.cpp" "5" @@ -9570,8 +9265,6 @@ "projectexplorer.qbs:235" "5" "analyzer_overlay_small.png" "5" "analyzer_overlay_small@2x.png" "5" -"build.png" "5" -"build@2x.png" "5" "build_32.png" "5" "build_hammerhandle_mask.png" "5" "build_hammerhandle_mask@2x.png" "5" @@ -9636,8 +9329,6 @@ "findproject.png" "5" "importasproject.png" "5" "importasproject@2x.png" "5" -"mode_project.png" "5" -"mode_project@2x.png" "5" "mode_project_mask.png" "5" "mode_project_mask@2x.png" "5" "ProjectDependencies.png" "5" @@ -9645,8 +9336,6 @@ "rebuildhammerhandles@2x.png" "5" "rebuildhammerheads.png" "5" "rebuildhammerheads@2x.png" "5" -"run.png" "5" -"run@2x.png" "5" "run_mask.png" "5" "run_mask@2x.png" "5" "RunSettings.png" "5" @@ -9665,7 +9354,6 @@ "projectexplorer.qbs:175" "5" "jsonfieldpage.cpp" "5" "jsonfieldpage.h" "5" -"jsonfieldpage_p.h" "5" "jsonfilepage.cpp" "5" "jsonfilepage.h" "5" "jsonkitspage.cpp" "5" @@ -9682,8 +9370,6 @@ "jsonwizardfilegenerator.h" "5" "jsonwizardgeneratorfactory.cpp" "5" "jsonwizardgeneratorfactory.h" "5" -"jsonwizardpagefactory.cpp" "5" -"jsonwizardpagefactory.h" "5" "jsonwizardpagefactory_p.cpp" "5" "jsonwizardpagefactory_p.h" "5" "jsonwizardscannergenerator.cpp" "5" @@ -9781,7 +9467,6 @@ "QbsProjectManager.json.in" "4" "qbs qml type info" "3" "qbsprojectmanager.qbs:68" "4" -"qbs-bundle.json" "4" "qbs.qmltypes" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:100" "4" @@ -9828,7 +9513,6 @@ "images" "5" "settingscategory_qbsprojectmanager.png" "6" "settingscategory_qbsprojectmanager@2x.png" "6" -"qbsprojectmanager_global.h" "3" "qbsprojectmanagerconstants.h" "3" "qbsprojectmanagerplugin.cpp" "3" "qbsprojectmanagerplugin.h" "3" @@ -9907,7 +9591,6 @@ "dark_headers.png" "8" "dark_sources.png" "8" "dark_unknown.png" "8" -"qmakeprojectmanager_global.h" "5" "qmakeprojectmanagerconstants.h" "5" "qmakeprojectmanagerplugin.cpp" "5" "qmakeprojectmanagerplugin.h" "5" @@ -10204,9 +9887,6 @@ "global_record_keyframes@2x.png" "10" "is_keyframe.png" "10" "is_keyframe@2x.png" "10" -"keyframe-16px.png" "10" -"keyframe.png" "10" -"keyframe@2x.png" "10" "keyframe_autobezier_active.png" "10" "keyframe_autobezier_active@2x.png" "10" "keyframe_autobezier_inactive.png" "10" @@ -10610,7 +10290,6 @@ "import.cpp" "7" "internalbindingproperty.cpp" "7" "internalbindingproperty.h" "7" -"internalnode.cpp" "7" "internalnode_p.h" "7" "internalnodeabstractproperty.cpp" "7" "internalnodeabstractproperty.h" "7" @@ -10624,7 +10303,6 @@ "internalsignalhandlerproperty.h" "7" "internalvariantproperty.cpp" "7" "internalvariantproperty.h" "7" -"model.cpp" "7" "model_p.h" "7" "modelmerger.cpp" "7" "modelnode.cpp" "7" @@ -10700,7 +10378,6 @@ "raise@2x.png" "10" "row.png" "10" "row@2x.png" "10" -"componentcore_constants.h" "7" "crumblebar.cpp" "7" "crumblebar.h" "7" "designeractionmanager.cpp" "7" @@ -10715,8 +10392,6 @@ "hdrimage.h" "7" "layoutingridlayout.cpp" "7" "layoutingridlayout.h" "7" -"modelnodecontextmenu.cpp" "7" -"modelnodecontextmenu.h" "7" "modelnodecontextmenu_helper.cpp" "7" "modelnodecontextmenu_helper.h" "7" "modelnodeoperations.cpp" "7" @@ -10828,8 +10503,6 @@ "scrubhandle-48.png" "9" "scrubhandle-disabled-24.png" "9" "scrubhandle-disabled-48.png" "9" -"snapping.png" "9" -"snapping@2x.png" "9" "snapping_and_anchoring.png" "9" "snapping_and_anchoring@2x.png" "9" "formeditorannotationicon.cpp" "7" @@ -10930,30 +10603,30 @@ "itemlibrary.qrc" "7" "/ItemLibrary" "8" "images" "9" -"asset_font_128.png" "10" -"asset_font_192.png" "10" -"asset_font_256.png" "10" "asset_font_32.png" "10" -"asset_font_384.png" "10" "asset_font_48.png" "10" "asset_font_64.png" "10" "asset_font_96.png" "10" -"asset_shader_128.png" "10" -"asset_shader_192.png" "10" -"asset_shader_256.png" "10" +"asset_font_128.png" "10" +"asset_font_192.png" "10" +"asset_font_256.png" "10" +"asset_font_384.png" "10" "asset_shader_32.png" "10" -"asset_shader_384.png" "10" "asset_shader_48.png" "10" "asset_shader_64.png" "10" "asset_shader_96.png" "10" -"asset_sound_128.png" "10" -"asset_sound_192.png" "10" -"asset_sound_256.png" "10" +"asset_shader_128.png" "10" +"asset_shader_192.png" "10" +"asset_shader_256.png" "10" +"asset_shader_384.png" "10" "asset_sound_32.png" "10" -"asset_sound_384.png" "10" "asset_sound_48.png" "10" "asset_sound_64.png" "10" "asset_sound_96.png" "10" +"asset_sound_128.png" "10" +"asset_sound_192.png" "10" +"asset_sound_256.png" "10" +"asset_sound_384.png" "10" "browse.png" "10" "browse@2x.png" "10" "item-3D_model-icon.png" "10" @@ -11163,76 +10836,55 @@ "qtquickplugin.qbs:23" "5" "images" "5" "animated-image-icon.png" "6" -"animated-image-icon16.png" "6" "animated-image-icon@2x.png" "6" "audio-output-16px.png" "6" "audio-output-24px.png" "6" "audio-output-24px@2x.png" "6" "border-image-icon.png" "6" -"border-image-icon16.png" "6" "border-image-icon@2x.png" "6" -"column-positioner-icon-16px.png" "6" "column-positioner-icon.png" "6" "column-positioner-icon@2x.png" "6" "component-icon.png" "6" -"component-icon16.png" "6" "component-icon@2x.png" "6" "default-icon.png" "6" "flickable-icon.png" "6" -"flickable-icon16.png" "6" "flickable-icon@2x.png" "6" "flipable-icon.png" "6" "flipable-icon16.png" "6" -"flow-positioner-icon-16px.png" "6" "flow-positioner-icon.png" "6" "flow-positioner-icon@2x.png" "6" "focusscope-icon.png" "6" -"focusscope-icon16.png" "6" "focusscope-icon@2x.png" "6" -"grid-positioner-icon-16px.png" "6" "grid-positioner-icon.png" "6" "grid-positioner-icon@2x.png" "6" "gridview-icon.png" "6" -"gridview-icon16.png" "6" "gridview-icon@2x.png" "6" "image-icon.png" "6" -"image-icon16.png" "6" "image-icon@2x.png" "6" "item-icon.png" "6" -"item-icon16.png" "6" "item-icon@2x.png" "6" "listview-icon.png" "6" -"listview-icon16.png" "6" "listview-icon@2x.png" "6" "loader-icon.png" "6" -"loader-icon16.png" "6" "loader-icon@2x.png" "6" "media-player-16px.png" "6" "media-player-24px.png" "6" "media-player-24px@2x.png" "6" "mouse-area-icon.png" "6" -"mouse-area-icon16.png" "6" "mouse-area-icon@2x.png" "6" "pathview-icon.png" "6" -"pathview-icon16.png" "6" "pathview-icon@2x.png" "6" "rect-icon.png" "6" -"rect-icon16.png" "6" "rect-icon@2x.png" "6" "repeater-icon.png" "6" -"repeater-icon16.png" "6" "repeater-icon@2x.png" "6" -"row-positioner-icon-16px.png" "6" "row-positioner-icon.png" "6" "row-positioner-icon@2x.png" "6" "text-edit-icon.png" "6" -"text-edit-icon16.png" "6" "text-edit-icon@2x.png" "6" "text-icon.png" "6" -"text-icon16.png" "6" "text-icon@2x.png" "6" "text-input-icon.png" "6" -"text-input-icon16.png" "6" "text-input-icon@2x.png" "6" "video-16px.png" "6" "video-24px.png" "6" @@ -11262,76 +10914,55 @@ "/qtquickplugin" "5" "images" "6" "animated-image-icon.png" "7" -"animated-image-icon16.png" "7" "animated-image-icon@2x.png" "7" "audio-output-16px.png" "7" "audio-output-24px.png" "7" "audio-output-24px@2x.png" "7" "border-image-icon.png" "7" -"border-image-icon16.png" "7" "border-image-icon@2x.png" "7" -"column-positioner-icon-16px.png" "7" "column-positioner-icon.png" "7" "column-positioner-icon@2x.png" "7" "component-icon.png" "7" -"component-icon16.png" "7" "component-icon@2x.png" "7" "default-icon.png" "7" "flickable-icon.png" "7" -"flickable-icon16.png" "7" "flickable-icon@2x.png" "7" "flipable-icon.png" "7" "flipable-icon16.png" "7" -"flow-positioner-icon-16px.png" "7" "flow-positioner-icon.png" "7" "flow-positioner-icon@2x.png" "7" "focusscope-icon.png" "7" -"focusscope-icon16.png" "7" "focusscope-icon@2x.png" "7" -"grid-positioner-icon-16px.png" "7" "grid-positioner-icon.png" "7" "grid-positioner-icon@2x.png" "7" "gridview-icon.png" "7" -"gridview-icon16.png" "7" "gridview-icon@2x.png" "7" "image-icon.png" "7" -"image-icon16.png" "7" "image-icon@2x.png" "7" "item-icon.png" "7" -"item-icon16.png" "7" "item-icon@2x.png" "7" "listview-icon.png" "7" -"listview-icon16.png" "7" "listview-icon@2x.png" "7" "loader-icon.png" "7" -"loader-icon16.png" "7" "loader-icon@2x.png" "7" "media-player-16px.png" "7" "media-player-24px.png" "7" "media-player-24px@2x.png" "7" "mouse-area-icon.png" "7" -"mouse-area-icon16.png" "7" "mouse-area-icon@2x.png" "7" "pathview-icon.png" "7" -"pathview-icon16.png" "7" "pathview-icon@2x.png" "7" "rect-icon.png" "7" -"rect-icon16.png" "7" "rect-icon@2x.png" "7" "repeater-icon.png" "7" -"repeater-icon16.png" "7" "repeater-icon@2x.png" "7" -"row-positioner-icon-16px.png" "7" "row-positioner-icon.png" "7" "row-positioner-icon@2x.png" "7" "text-edit-icon.png" "7" -"text-edit-icon16.png" "7" "text-edit-icon@2x.png" "7" "text-icon.png" "7" -"text-icon16.png" "7" "text-icon@2x.png" "7" "text-input-icon.png" "7" -"text-input-icon16.png" "7" "text-input-icon@2x.png" "7" "video-16px.png" "7" "video-24px.png" "7" @@ -11387,11 +11018,9 @@ "qmljseditingsettingspage.ui" "3" "qmljseditor.cpp" "3" "qmljseditor.h" "3" -"qmljseditor_global.h" "3" "qmljseditorconstants.h" "3" "qmljseditordocument.cpp" "3" "qmljseditordocument.h" "3" -"qmljseditordocument_p.h" "3" "qmljseditorplugin.cpp" "3" "qmljseditorplugin.h" "3" "qmljsfindreferences.cpp" "3" @@ -11467,7 +11096,6 @@ "images" "5" "settingscategory_qml.png" "6" "settingscategory_qml@2x.png" "6" -"qmljstools_global.h" "3" "qmljstoolsconstants.h" "3" "qmljstoolsplugin.cpp" "3" "qmljstoolsplugin.h" "3" @@ -11715,7 +11343,6 @@ "qnxdevice@2x.png" "6" "qnxdevicesmall.png" "6" "qnxdevicesmall@2x.png" "6" -"qnx_export.h" "3" "qnxanalyzesupport.cpp" "3" "qnxanalyzesupport.h" "3" "qnxbaseqtconfigwidget.cpp" "3" @@ -11790,14 +11417,12 @@ "qmakebuiltins.cpp" "5" "qmakeevaluator.cpp" "5" "qmakeevaluator.h" "5" -"qmakeevaluator_p.h" "5" "qmakeglobals.cpp" "5" "qmakeglobals.h" "5" "qmakeparser.cpp" "5" "qmakeparser.h" "5" "qmakevfs.cpp" "5" "qmakevfs.h" "5" -"registry.cpp" "5" "registry_p.h" "5" "QtVersion" "4" "qtsupport.qbs:111" "5" @@ -11858,7 +11483,6 @@ "dark_qt_qrc.png" "7" "images_areaofinterest.xml" "6" "qtcreator_tutorials.xml" "6" -"qtsupport_global.h" "4" "qtsupportconstants.h" "4" "qtsupportplugin.cpp" "4" "qtsupportplugin.h" "4" @@ -11931,8 +11555,6 @@ "/remotelinux" "5" "images" "6" "embeddedtarget.png" "7" -"remotelinux_constants.h" "4" -"remotelinux_export.h" "4" "remotelinuxcheckforfreediskspaceservice.cpp" "4" "remotelinuxcheckforfreediskspaceservice.h" "4" "remotelinuxcheckforfreediskspacestep.cpp" "4" @@ -12001,11 +11623,9 @@ "qrceditor.cpp" "5" "qrceditor.h" "5" "qrceditor.ui" "5" -"resourcefile.cpp" "5" "resourcefile_p.h" "5" "resourceview.cpp" "5" "resourceview.h" "5" -"undocommands.cpp" "5" "undocommands_p.h" "5" "standard pch file (gui)" "4" "QtcProduct.qbs:100" "5" @@ -12064,9 +11684,7 @@ "initial.png" "7" "more_colors.png" "7" "navigator.png" "7" -"parallel.png" "7" "parallel_icon.png" "7" -"state.png" "7" "state_color.png" "7" "statistics.png" "7" "dragshapebutton.cpp" "4" @@ -12542,8 +12160,6 @@ "settingscategory_texteditor.png" "7" "settingscategory_texteditor@2x.png" "7" "snippet.png" "7" -"texteditor_global.h" "4" -"texteditor_p.h" "4" "texteditoractionhandler.cpp" "4" "texteditoractionhandler.h" "4" "texteditorconstants.cpp" "4" @@ -12657,7 +12273,6 @@ "callgrinddatamodel.h" "4" "callgrindfunction.cpp" "4" "callgrindfunction.h" "4" -"callgrindfunction_p.h" "4" "callgrindfunctioncall.cpp" "4" "callgrindfunctioncall.h" "4" "callgrindfunctioncycle.cpp" "4" @@ -12810,7 +12425,6 @@ "submit_arrow@2x.png" "6" "submit_db.png" "6" "submit_db@2x.png" "6" -"vcsbase_global.h" "3" "vcsbaseclient.cpp" "3" "vcsbaseclient.h" "3" "vcsbaseclientsettings.cpp" "3" @@ -12854,7 +12468,6 @@ "webassemblydevice@2x.png" "6" "webassemblydevicesmall.png" "6" "webassemblydevicesmall@2x.png" "6" -"webassembly_global.h" "3" "webassemblyconstants.h" "3" "webassemblydevice.cpp" "3" "webassemblydevice.h" "3" @@ -12899,8 +12512,6 @@ "download@2x.png" "6" "expandarrow.png" "6" "expandarrow@2x.png" "6" -"mode_welcome.png" "6" -"mode_welcome@2x.png" "6" "mode_welcome_mask.png" "6" "mode_welcome_mask@2x.png" "6" "new.png" "6" @@ -13877,10 +13488,6 @@ "identifier-expansion.4.out.cpp" "5" "identifier-expansion.5.cpp" "5" "identifier-expansion.5.out.cpp" "5" -"macro-test.cpp" "5" -"macro-test.out.cpp" "5" -"macro_expand.c" "5" -"macro_expand.out.c" "5" "macro_expand_1.cpp" "5" "macro_expand_1.out.cpp" "5" "macro_pounder_fn.c" "5" @@ -14133,10 +13740,7 @@ "test specs" "5" "test.qbs:17" "6" "testspecs" "6" -"simplespec.json" "7" "simplespec_experimental.json" "7" -"spec1.json" "7" -"spec2.json" "7" "spec_wrong2.json" "7" "spec_wrong3.json" "7" "spec_wrong4.json" "7" @@ -14145,7 +13749,6 @@ "testplugin.qbs:4" "5" "testplugin.cpp" "5" "testplugin.h" "5" -"testplugin_global.h" "5" "PluginManager autotests" "3" "pluginmanager.qbs:3" "4" "ExtensionSystem cirular plugins autotests" "4" @@ -14264,14 +13867,12 @@ "qmakebuiltins.cpp" "4" "qmakeevaluator.cpp" "4" "qmakeevaluator.h" "4" -"qmakeevaluator_p.h" "4" "qmakeglobals.cpp" "4" "qmakeglobals.h" "4" "qmakeparser.cpp" "4" "qmakeparser.h" "4" "qmakevfs.cpp" "4" "qmakevfs.h" "4" -"registry.cpp" "4" "registry_p.h" "4" "standard pch file (gui)" "3" "QtcProduct.qbs:100" "4" @@ -14774,7 +14375,6 @@ "callgrinddatamodel.h" "6" "callgrindfunction.cpp" "6" "callgrindfunction.h" "6" -"callgrindfunction_p.h" "6" "callgrindfunctioncall.cpp" "6" "callgrindfunctioncall.h" "6" "callgrindfunctioncycle.cpp" "6" @@ -14842,7 +14442,6 @@ "design.creatortheme" "7" "flat-dark.creatortheme" "7" "flat-light.creatortheme" "7" -"flat.creatortheme" "7" "themeselector.cpp" "5" "themeselector.h" "5" "tst_manual_widgets_tracing.cpp" "4" @@ -14857,7 +14456,6 @@ "design.creatortheme" "7" "flat-dark.creatortheme" "7" "flat-light.creatortheme" "7" -"flat.creatortheme" "7" "themeselector.cpp" "5" "themeselector.h" "5" "tst_manual_widgets_crumblepath.cpp" "4" @@ -14872,7 +14470,6 @@ "design.creatortheme" "7" "flat-dark.creatortheme" "7" "flat-light.creatortheme" "7" -"flat.creatortheme" "7" "themeselector.cpp" "5" "themeselector.h" "5" "tst_manual_widgets_infolabel.cpp" "4" @@ -14887,7 +14484,6 @@ "design.creatortheme" "7" "flat-dark.creatortheme" "7" "flat-light.creatortheme" "7" -"flat.creatortheme" "7" "themeselector.cpp" "5" "themeselector.h" "5" "tst_manual_widgets_manhattanstyle.cpp" "4" |