diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2023-09-14 12:15:19 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-09-18 11:50:09 +0000 |
| commit | bdded29b33bb22b8996dfb5f04f85c02404f1c2c (patch) | |
| tree | 6f6e697ab35f6226d670a219a3ce31550d0718c2 | |
| parent | 2842eeeeccd61f6b1a68c869b3c7db9a51bf1143 (diff) | |
qbs build: Improve some base items
Clean-up, simplification and modernization.
Also fix the bugs uncovered by this.
Change-Id: Ia3a77557f10faf9a901540a55fd6c07a2e986bf5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
97 files changed, 232 insertions, 278 deletions
diff --git a/qbs/imports/QtcAutotest.qbs b/qbs/imports/QtcAutotest.qbs index 91427f75115..523f1cdbfd7 100644 --- a/qbs/imports/QtcAutotest.qbs +++ b/qbs/imports/QtcAutotest.qbs @@ -2,21 +2,19 @@ import qbs import qbs.FileInfo QtcProduct { + // This needs to be absolute, because it is passed to one of the source files. + destinationDirectory: project.buildDirectory + '/' + + FileInfo.relativePath(project.ide_source_tree, sourceDirectory) + + targetName: "tst_" + name.split(' ').join("") type: ["application", "autotest"] + installTags: [] + Depends { name: "autotest" } Depends { name: "Qt.testlib" } Depends { name: "copyable_resource" } - targetName: "tst_" + name.split(' ').join("") - - // This needs to be absolute, because it is passed to one of the source files. - destinationDirectory: project.buildDirectory + '/' - + FileInfo.relativePath(project.ide_source_tree, sourceDirectory) - cpp.rpaths: [ - project.buildDirectory + '/' + qtc.ide_library_path, - project.buildDirectory + '/' + qtc.ide_plugin_path - ] cpp.defines: { var defines = base.filter(function(d) { return d !== "QT_RESTRICTED_CAST_FROM_ASCII"; }); var absLibExecPath = FileInfo.joinPaths(qbs.installRoot, qbs.installPrefix, @@ -25,11 +23,10 @@ QtcProduct { defines.push('TEST_RELATIVE_LIBEXEC_PATH="' + relLibExecPath + '"'); return defines; } - - Group { - fileTagsFilter: product.type - qbs.install: false - } + cpp.rpaths: [ + project.buildDirectory + '/' + qtc.ide_library_path, + project.buildDirectory + '/' + qtc.ide_plugin_path + ] // The following would be conceptually right, but does not work currently as some autotests // (e.g. extensionsystem) do not work when installed, because they want hardcoded diff --git a/qbs/imports/QtcCommercialPlugin.qbs b/qbs/imports/QtcCommercialPlugin.qbs index 712ad9f1574..f26af46f2b5 100644 --- a/qbs/imports/QtcCommercialPlugin.qbs +++ b/qbs/imports/QtcCommercialPlugin.qbs @@ -1,5 +1,3 @@ -import qbs - QtcPlugin { Depends { name: "LicenseChecker"; required: false } cpp.defines: base.concat(LicenseChecker.present ? ["LICENSECHECKER"] : []) diff --git a/qbs/imports/QtcDocumentation.qbs b/qbs/imports/QtcDocumentation.qbs index c1b10310d26..3017114c8c4 100644 --- a/qbs/imports/QtcDocumentation.qbs +++ b/qbs/imports/QtcDocumentation.qbs @@ -1,38 +1,38 @@ -import qbs import qbs.FileInfo Product { builtByDefault: false type: [isOnlineDoc ? "qdoc-output" : "qch"] + Depends { name: "Qt.core" } Depends { name: "qtc" } - property path mainDocConfFile property bool isOnlineDoc - - Group { - name: "main qdocconf file" - prefix: product.sourceDirectory + '/' - files: [mainDocConfFile] - fileTags: ["qdocconf-main"] - } - + property path mainDocConfFile property string versionTag: qtc.qtcreator_version.replace(/\.|-/g, "") + Qt.core.qdocEnvironment: [ "IDE_DISPLAY_NAME=" + qtc.ide_display_name, - "IDE_ID=" + qtc.ide_id, "IDE_CASED_ID=" + qtc.ide_cased_id, + "IDE_ID=" + qtc.ide_id, "QTCREATOR_COPYRIGHT_YEAR=" + qtc.qtcreator_copyright_year, "QTC_VERSION=" + qtc.qtcreator_version, "QTC_VERSION_TAG=" + qtc.qtcreator_version, - "SRCDIR=" + sourceDirectory, "QT_INSTALL_DOCS=" + Qt.core.docPath, "QDOC_INDEX_DIR=" + Qt.core.docPath, - "VERSION_TAG=" + versionTag + "SRCDIR=" + sourceDirectory, + "VERSION_TAG=" + versionTag, ] Group { - fileTagsFilter: ["qch"] + name: "main qdocconf file" + prefix: product.sourceDirectory + '/' + files: mainDocConfFile + fileTags: "qdocconf-main" + } + + Group { + fileTagsFilter: "qch" qbs.install: !qbs.targetOS.contains("macos") qbs.installDir: qtc.ide_doc_path } diff --git a/qbs/imports/QtcLibrary.qbs b/qbs/imports/QtcLibrary.qbs index 887a79dbb5d..a0b8b7c8176 100644 --- a/qbs/imports/QtcLibrary.qbs +++ b/qbs/imports/QtcLibrary.qbs @@ -1,19 +1,14 @@ -import qbs 1.0 import qbs.FileInfo import QtcFunctions QtcProduct { type: ["dynamiclibrary", "dynamiclibrary_symlink"] + destinationDirectory: FileInfo.joinPaths(project.buildDirectory, qtc.ide_library_path) + targetName: QtcFunctions.qtLibraryName(qbs, name) + installDir: qtc.ide_library_path - installTags: ["dynamiclibrary", "dynamiclibrary_symlink", "debuginfo_dll"] + installTags: type.concat("debuginfo_dll") useNonGuiPchFile: true - Depends { - condition: qtc.testsEnabled - name: "Qt.testlib" - } - - targetName: QtcFunctions.qtLibraryName(qbs, name) - destinationDirectory: FileInfo.joinPaths(project.buildDirectory, qtc.ide_library_path) cpp.linkerFlags: { var flags = base; @@ -23,17 +18,13 @@ QtcProduct { flags.push("-compatibility_version", qtc.qtcreator_compat_version); return flags; } - cpp.sonamePrefix: qbs.targetOS.contains("macos") - ? "@rpath" - : undefined + cpp.sonamePrefix: qbs.targetOS.contains("macos") ? "@rpath" : undefined cpp.rpaths: qbs.targetOS.contains("macos") ? ["@loader_path/../Frameworks"] : ["$ORIGIN", "$ORIGIN/.."] - property string libIncludeBase: ".." // #include <lib/header.h> - cpp.includePaths: [libIncludeBase] Export { Depends { name: "cpp" } - cpp.includePaths: [exportingProduct.libIncludeBase] + cpp.includePaths: project.ide_source_tree + "/src/libs" } } diff --git a/qbs/imports/QtcManualtest.qbs b/qbs/imports/QtcManualtest.qbs index cfa1abc1d8f..0c47bf1c8fa 100644 --- a/qbs/imports/QtcManualtest.qbs +++ b/qbs/imports/QtcManualtest.qbs @@ -1,23 +1,22 @@ -import qbs import qbs.FileInfo QtcProduct { - type: ["application"] + destinationDirectory: project.buildDirectory + '/' + + FileInfo.relativePath(project.ide_source_tree, sourceDirectory) + targetName: "tst_" + name.split(' ').join("") + type: "application" + + install: false Depends { name: "Qt.testlib" } Depends { name: "copyable_resource" } - targetName: "tst_" + name.split(' ').join("") - cpp.rpaths: [ - project.buildDirectory + '/' + qtc.ide_library_path, - project.buildDirectory + '/' + qtc.ide_plugin_path - ] cpp.defines: { var defines = base.filter(function(d) { return d !== "QT_RESTRICTED_CAST_FROM_ASCII"; }); return defines; } - - destinationDirectory: project.buildDirectory + '/' - + FileInfo.relativePath(project.ide_source_tree, sourceDirectory) - install: false + cpp.rpaths: [ + project.buildDirectory + '/' + qtc.ide_library_path, + project.buildDirectory + '/' + qtc.ide_plugin_path + ] } diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index 221789ef605..8c26050328f 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -1,38 +1,25 @@ -import qbs 1.0 import qbs.FileInfo import QtcFunctions QtcProduct { + destinationDirectory: FileInfo.joinPaths(project.buildDirectory, qtc.ide_plugin_path) + name: project.name + targetName: QtcFunctions.qtLibraryName(qbs, name) type: ["dynamiclibrary", "pluginSpec"] + installDir: qtc.ide_plugin_path installTags: ["dynamiclibrary", "debuginfo_dll"] useGuiPchFile: true - property var pluginRecommends: [] - property var pluginTestDepends: [] - - targetName: QtcFunctions.qtLibraryName(qbs, name) - destinationDirectory: FileInfo.joinPaths(project.buildDirectory, qtc.ide_plugin_path) + property stringList pluginRecommends: [] + property stringList pluginTestDepends: [] + Depends { name: "Qt.testlib"; condition: qtc.testsEnabled } Depends { name: "ExtensionSystem" } Depends { name: "pluginjson" } - pluginjson.useVcsData: false - Depends { - condition: qtc.testsEnabled - name: "Qt.testlib" - } - Properties { - condition: qbs.targetOS.contains("unix") - cpp.internalVersion: "" - } cpp.defines: base.concat([name.toUpperCase() + "_LIBRARY"]) - cpp.sonamePrefix: qbs.targetOS.contains("macos") - ? "@rpath" - : undefined - cpp.rpaths: qbs.targetOS.contains("macos") - ? ["@loader_path/../Frameworks", "@loader_path/../PlugIns"] - : ["$ORIGIN", "$ORIGIN/.."] + Properties { cpp.internalVersion: ""; condition: qbs.targetOS.contains("unix") } cpp.linkerFlags: { var flags = base; if (qbs.buildVariant == "debug" && qbs.toolchain.contains("msvc")) @@ -41,20 +28,24 @@ QtcProduct { flags.push("-compatibility_version", qtc.qtcreator_compat_version); return flags; } - - property string pluginIncludeBase: ".." // #include <plugin/header.h> - cpp.includePaths: [pluginIncludeBase] + cpp.rpaths: qbs.targetOS.contains("macos") + ? ["@loader_path/../Frameworks", "@loader_path/../PlugIns"] + : ["$ORIGIN", "$ORIGIN/.."] + cpp.sonamePrefix: qbs.targetOS.contains("macos") + ? "@rpath" + : undefined + pluginjson.useVcsData: false Group { name: "PluginMetaData" - prefix: product.sourceDirectory + '/' - files: [ product.name + ".json.in" ] - fileTags: ["pluginJsonIn"] + prefix: sourceDirectory + '/' + files: product.name + ".json.in" + fileTags: "pluginJsonIn" } Export { - Depends { name: "ExtensionSystem" } Depends { name: "cpp" } - cpp.includePaths: [exportingProduct.pluginIncludeBase] + Depends { name: "ExtensionSystem" } + cpp.includePaths: ".." } } diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index e5f341704df..4841709e6d1 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -1,16 +1,13 @@ -import qbs 1.0 import qbs.FileInfo import qbs.Utilities -import QtcFunctions Product { - name: project.name version: qtc.qtcreator_version + property bool install: true property string installDir property string installSourceBase: destinationDirectory property stringList installTags: type - property string fileName: FileInfo.fileName(sourceDirectory) + ".qbs" property bool useNonGuiPchFile: false property bool useGuiPchFile: false property bool useQt: true @@ -20,15 +17,6 @@ Product { property bool sanitizable: true Depends { name: "cpp" } - Depends { name: "qtc" } - Depends { - name: product.name + " dev headers"; - required: false - Properties { - condition: Utilities.versionCompare(qbs.version, "1.13") >= 0 - enableFallback: false - } - } Depends { name: "Qt" condition: useQt @@ -36,10 +24,7 @@ Product { versionAtLeast: "6.2.0" } - // TODO: Should fall back to what came from Qt.core for Qt < 5.7, but we cannot express that - // atm. Conditionally pulling in a module that sets the property is also not possible, - // because conflicting scalar values would be reported (QBS-1225 would fix that). - cpp.minimumMacosVersion: project.minimumMacosVersion + Depends { name: "qtc" } cpp.cxxFlags: { var flags = []; @@ -62,7 +47,8 @@ Product { } return flags; } - + cpp.cxxLanguageVersion: "c++17" + cpp.defines: qtc.generalDefines Properties { condition: sanitizable && qbs.toolchain.contains("gcc") cpp.driverFlags: { @@ -76,9 +62,7 @@ Product { return flags; } } - - cpp.cxxLanguageVersion: "c++17" - cpp.defines: qtc.generalDefines + cpp.minimumMacosVersion: "10.15" cpp.minimumWindowsVersion: "6.1" cpp.useCxxPrecompiledHeader: useQt && (useNonGuiPchFile || useGuiPchFile) cpp.visibility: "minimal" @@ -94,15 +78,15 @@ Product { name: "standard pch file (non-gui)" condition: useNonGuiPchFile prefix: pathToSharedSources + '/' - files: ["qtcreator_pch.h"] - fileTags: ["cpp_pch_src"] + files: "qtcreator_pch.h" + fileTags: "cpp_pch_src" } Group { name: "standard pch file (gui)" condition: useGuiPchFile prefix: pathToSharedSources + '/' - files: ["qtcreator_gui_pch.h"] - fileTags: ["cpp_pch_src"] + files: "qtcreator_gui_pch.h" + fileTags: "cpp_pch_src" } } diff --git a/qbs/imports/QtcTestApp.qbs b/qbs/imports/QtcTestApp.qbs index 8411ea9b9e4..bca15924c7b 100644 --- a/qbs/imports/QtcTestApp.qbs +++ b/qbs/imports/QtcTestApp.qbs @@ -1,4 +1,3 @@ -import qbs import qbs.FileInfo CppApplication { diff --git a/qbs/imports/QtcTestFiles.qbs b/qbs/imports/QtcTestFiles.qbs index ab27a8df8a1..e1be695dac0 100644 --- a/qbs/imports/QtcTestFiles.qbs +++ b/qbs/imports/QtcTestFiles.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - Group { name: "Unit tests" condition: qtc.testsEnabled diff --git a/qbs/imports/QtcTool.qbs b/qbs/imports/QtcTool.qbs index 1b389686502..e93829cc630 100644 --- a/qbs/imports/QtcTool.qbs +++ b/qbs/imports/QtcTool.qbs @@ -1,11 +1,11 @@ -import qbs import qbs.FileInfo QtcProduct { - type: ["application"] consoleApplication: true + type: "application" + installDir: qtc.ide_libexec_path - installTags: base.concat(["debuginfo_app"]) + installTags: type.concat("debuginfo_app") useNonGuiPchFile: true cpp.rpaths: { diff --git a/qtcreator.qbs b/qtcreator.qbs index c0779f4af10..c3aca8caca5 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -5,7 +5,6 @@ import qbs.FileInfo Project { name: "Qt Creator" minimumQbsVersion: "1.19.0" - property string minimumMacosVersion: "10.15" property bool withAutotests: qbs.buildVariant === "debug" property path ide_source_tree: path property pathList additionalPlugins: [] diff --git a/src/libs/3rdparty/libptyqt/ptyqt.qbs b/src/libs/3rdparty/libptyqt/ptyqt.qbs index 40c920a59ce..3b56dd8e465 100644 --- a/src/libs/3rdparty/libptyqt/ptyqt.qbs +++ b/src/libs/3rdparty/libptyqt/ptyqt.qbs @@ -1,12 +1,11 @@ QtcLibrary { name: "ptyqt" + type: "staticlibrary" Depends { name: "Qt.core" } Depends { name: "Qt.network"; condition: qbs.targetOS.contains("windows") } Depends { name: "winpty"; condition: qbs.targetOS.contains("windows") } - type: "staticlibrary" - files: [ "iptyprocess.h", "ptyqt.cpp", @@ -36,6 +35,6 @@ QtcLibrary { Export { Depends { name: "cpp" } Depends { name: "winpty"; condition: qbs.targetOS.contains("windows") } - cpp.includePaths: base.concat(exportingProduct.sourceDirectory) + cpp.includePaths: exportingProduct.sourceDirectory } } diff --git a/src/libs/3rdparty/libvterm/vterm.qbs b/src/libs/3rdparty/libvterm/vterm.qbs index a1525879f53..e35658908da 100644 --- a/src/libs/3rdparty/libvterm/vterm.qbs +++ b/src/libs/3rdparty/libvterm/vterm.qbs @@ -2,7 +2,10 @@ QtcLibrary { name: "vterm" type: "staticlibrary" + useQt: false + Depends { name: "cpp" } + cpp.includePaths: base.concat("include") cpp.warningLevel: "none" @@ -27,6 +30,6 @@ QtcLibrary { Export { Depends { name: "cpp" } - cpp.includePaths: base.concat("include") + cpp.includePaths: "include" } } diff --git a/src/libs/3rdparty/winpty/winpty.qbs b/src/libs/3rdparty/winpty/winpty.qbs index f6160fe9e62..35d56f92655 100644 --- a/src/libs/3rdparty/winpty/winpty.qbs +++ b/src/libs/3rdparty/winpty/winpty.qbs @@ -5,7 +5,6 @@ Project { name: "Winpty" condition: qbs.targetOS.contains("windows") - Product { name: "winpty_genversion_header" type: "hpp" @@ -199,8 +198,8 @@ Project { Export { Depends { name: "cpp" } - cpp.defines: base.concat("COMPILING_WINPTY_DLL") - cpp.includePaths: base.concat(exportingProduct.sourceDirectory + "/src/include") + cpp.defines: "COMPILING_WINPTY_DLL" + cpp.includePaths: exportingProduct.sourceDirectory + "/src/include" } } } diff --git a/src/libs/extensionsystem/extensionsystem.qbs b/src/libs/extensionsystem/extensionsystem.qbs index 414060fd3ba..07fc87fd286 100644 --- a/src/libs/extensionsystem/extensionsystem.qbs +++ b/src/libs/extensionsystem/extensionsystem.qbs @@ -1,12 +1,11 @@ QtcLibrary { name: "ExtensionSystem" - cpp.defines: base.concat([ - "EXTENSIONSYSTEM_LIBRARY", - "IDE_TEST_DIR=\".\"" - ]) + cpp.defines: base.concat(["EXTENSIONSYSTEM_LIBRARY", "IDE_TEST_DIR=\".\""]) Depends { name: "Qt"; submodules: ["core", "widgets"] } + Depends { name: "Qt.testlib"; condition: qtc.testsEnabled } + Depends { name: "Aggregation" } Depends { name: "Utils" } diff --git a/src/libs/solutions/spinner/spinner.qbs b/src/libs/solutions/spinner/spinner.qbs index cd830d107ec..d02858d0484 100644 --- a/src/libs/solutions/spinner/spinner.qbs +++ b/src/libs/solutions/spinner/spinner.qbs @@ -1,6 +1,8 @@ QtcLibrary { name: "Spinner" - Depends { name: "Qt"; submodules: ["core", "widgets"] } + + Depends { name: "Qt.widgets" } + cpp.defines: base.concat("SPINNER_LIBRARY") files: [ @@ -9,5 +11,10 @@ QtcLibrary { "spinner.qrc", "spinner_global.h", ] + + Export { + Depends { name: "cpp" } + cpp.includePaths: ".." + } } diff --git a/src/libs/solutions/tasking/tasking.qbs b/src/libs/solutions/tasking/tasking.qbs index fa0a5ebacc9..fba42b10b1d 100644 --- a/src/libs/solutions/tasking/tasking.qbs +++ b/src/libs/solutions/tasking/tasking.qbs @@ -1,6 +1,8 @@ QtcLibrary { name: "Tasking" - Depends { name: "Qt"; submodules: ["concurrent", "core", "network"] } + + Depends { name: "Qt"; submodules: ["concurrent", "network"] } + cpp.defines: base.concat("TASKING_LIBRARY") files: [ @@ -13,5 +15,10 @@ QtcLibrary { "tasktree.cpp", "tasktree.h", ] + + Export { + Depends { name: "cpp" } + cpp.includePaths: ["..", "../.."] + } } diff --git a/src/libs/solutions/terminal/terminal.qbs b/src/libs/solutions/terminal/terminal.qbs index cb312890fb6..aa1293e3994 100644 --- a/src/libs/solutions/terminal/terminal.qbs +++ b/src/libs/solutions/terminal/terminal.qbs @@ -1,14 +1,10 @@ -import qbs 1.0 - QtcLibrary { name: "TerminalLib" Depends { name: "vterm" } - Depends { name: "Qt"; submodules: "widgets" } + Depends { name: "Qt.widgets" } - cpp.defines: base.concat([ - "TERMINALLIB_LIBRARY" - ]) + cpp.defines: base.concat("TERMINALLIB_LIBRARY") files: [ "celliterator.cpp", diff --git a/src/libs/sqlite/sqlite.qbs b/src/libs/sqlite/sqlite.qbs index f0c58790006..3f1b1050c9d 100644 --- a/src/libs/sqlite/sqlite.qbs +++ b/src/libs/sqlite/sqlite.qbs @@ -3,6 +3,7 @@ import qbs 1.0 QtcLibrary { name: "Sqlite" + Depends { name: "Utils" } Depends { name: "sqlite_sources" } property string exportedIncludeDir: sqlite_sources.includeDir diff --git a/src/libs/utils/mimetypes2/mimemagicrule_p.h b/src/libs/utils/mimetypes2/mimemagicrule_p.h index fe2e0ff3e42..293f61ca914 100644 --- a/src/libs/utils/mimetypes2/mimemagicrule_p.h +++ b/src/libs/utils/mimetypes2/mimemagicrule_p.h @@ -14,7 +14,7 @@ // We mean it. // -#include <utils/utils_global.h> +#include "../utils_global.h" #include <QtCore/qbytearray.h> #include <QtCore/qlist.h> diff --git a/src/libs/utils/mimetypes2/mimetype.h b/src/libs/utils/mimetypes2/mimetype.h index ec28140d6ae..b512aaae723 100644 --- a/src/libs/utils/mimetypes2/mimetype.h +++ b/src/libs/utils/mimetypes2/mimetype.h @@ -4,7 +4,7 @@ #pragma once -#include <utils/utils_global.h> +#include "../utils_global.h" #include <QtCore/qobjectdefs.h> #include <QtCore/qshareddata.h> diff --git a/src/libs/utils/searchresultitem.h b/src/libs/utils/searchresultitem.h index bbaaa1caf5e..766da19ffdc 100644 --- a/src/libs/utils/searchresultitem.h +++ b/src/libs/utils/searchresultitem.h @@ -5,9 +5,9 @@ #include "utils_global.h" -#include <utils/filepath.h> -#include <utils/hostosinfo.h> -#include <utils/textutils.h> +#include "filepath.h" +#include "hostosinfo.h" +#include "textutils.h" #include <QColor> #include <QHash> diff --git a/src/libs/utils/stringtable.h b/src/libs/utils/stringtable.h index 1394b1c853d..eedfe513552 100644 --- a/src/libs/utils/stringtable.h +++ b/src/libs/utils/stringtable.h @@ -3,7 +3,7 @@ #pragma once -#include <utils/utils_global.h> +#include "utils_global.h" namespace Utils::StringTable { diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index 0c74fedc443..768a7c83acf 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -472,6 +472,6 @@ QtcLibrary { Export { Depends { name: "Qt"; submodules: ["concurrent", "widgets" ] } Depends { name: "Tasking" } - cpp.includePaths: base.concat("mimetypes2") + cpp.includePaths: "mimetypes2" } } diff --git a/src/plugins/clangtools/clangselectablefilesdialog.cpp b/src/plugins/clangtools/clangselectablefilesdialog.cpp index 410f4847692..414c320b8bc 100644 --- a/src/plugins/clangtools/clangselectablefilesdialog.cpp +++ b/src/plugins/clangtools/clangselectablefilesdialog.cpp @@ -7,6 +7,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/find/itemviewfind.h> +#include <coreplugin/find/textfindconstants.h> #include <cppeditor/projectinfo.h> #include <projectexplorer/selectablefilesmodel.h> #include <texteditor/textdocument.h> diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp index f1e40c8f6b3..914a750e09a 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp +++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp @@ -4,8 +4,8 @@ #include "actioncontainer_p.h" #include "actionmanager.h" -#include <coreplugin/coreconstants.h> -#include <coreplugin/icontext.h> +#include "../coreconstants.h" +#include "../icontext.h" #include <utils/qtcassert.h> diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h index 509a45ebfcf..cb94852aa0c 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h +++ b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h @@ -5,8 +5,8 @@ #include "actionmanager_p.h" -#include <coreplugin/actionmanager/actioncontainer.h> -#include <coreplugin/actionmanager/command.h> +#include "actioncontainer.h" +#include "command.h" #include <utils/touchbar/touchbar.h> diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp index d3ae55ab163..57d1f19e15f 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp +++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp @@ -5,8 +5,7 @@ #include "actionmanager_p.h" #include "actioncontainer_p.h" #include "command_p.h" - -#include <coreplugin/icore.h> +#include "../icore.h" #include <utils/algorithm.h> #include <utils/fadingindicator.h> diff --git a/src/plugins/coreplugin/actionmanager/actionmanager_p.h b/src/plugins/coreplugin/actionmanager/actionmanager_p.h index b305369ab58..c10f109a6ea 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager_p.h +++ b/src/plugins/coreplugin/actionmanager/actionmanager_p.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/icontext.h> +#include "../icontext.h" #include <QMap> #include <QHash> diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp index 23b398791f2..fdb1bdc4016 100644 --- a/src/plugins/coreplugin/actionmanager/command.cpp +++ b/src/plugins/coreplugin/actionmanager/command.cpp @@ -4,8 +4,8 @@ #include "command.h" #include "command_p.h" -#include <coreplugin/coreconstants.h> -#include <coreplugin/icontext.h> +#include "../coreconstants.h" +#include "../icontext.h" #include <utils/hostosinfo.h> #include <utils/stringutils.h> diff --git a/src/plugins/coreplugin/actionmanager/command.h b/src/plugins/coreplugin/actionmanager/command.h index 73dd92a5eb8..206acafaefc 100644 --- a/src/plugins/coreplugin/actionmanager/command.h +++ b/src/plugins/coreplugin/actionmanager/command.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/core_global.h> +#include "../core_global.h" #include <utils/hostosinfo.h> #include <utils/id.h> diff --git a/src/plugins/coreplugin/actionmanager/command_p.h b/src/plugins/coreplugin/actionmanager/command_p.h index 04cbc44f13e..d90b807c553 100644 --- a/src/plugins/coreplugin/actionmanager/command_p.h +++ b/src/plugins/coreplugin/actionmanager/command_p.h @@ -5,7 +5,7 @@ #include "command.h" -#include <coreplugin/icontext.h> +#include "../icontext.h" #include <utils/id.h> #include <utils/proxyaction.h> diff --git a/src/plugins/coreplugin/actionmanager/commandbutton.h b/src/plugins/coreplugin/actionmanager/commandbutton.h index c5b6d71852c..db46225b08f 100644 --- a/src/plugins/coreplugin/actionmanager/commandbutton.h +++ b/src/plugins/coreplugin/actionmanager/commandbutton.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/core_global.h> +#include "../core_global.h" #include <utils/id.h> diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.cpp b/src/plugins/coreplugin/actionmanager/commandmappings.cpp index 15765698cbd..276004bdb78 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.cpp +++ b/src/plugins/coreplugin/actionmanager/commandmappings.cpp @@ -3,8 +3,8 @@ #include "commandmappings.h" -#include <coreplugin/coreplugintr.h> -#include <coreplugin/dialogs/shortcutsettings.h> +#include "../coreplugintr.h" +#include "../dialogs/shortcutsettings.h" #include <utils/fancylineedit.h> #include <utils/headerviewstretcher.h> diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.h b/src/plugins/coreplugin/actionmanager/commandmappings.h index a6725265500..d72adf00f32 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.h +++ b/src/plugins/coreplugin/actionmanager/commandmappings.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/core_global.h> +#include "../core_global.h" #include <QWidget> diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.cpp b/src/plugins/coreplugin/actionmanager/commandsfile.cpp index ccd551751e7..18866662ba2 100644 --- a/src/plugins/coreplugin/actionmanager/commandsfile.cpp +++ b/src/plugins/coreplugin/actionmanager/commandsfile.cpp @@ -3,8 +3,8 @@ #include "commandsfile.h" #include "command.h" -#include <coreplugin/dialogs/shortcutsettings.h> -#include <coreplugin/icore.h> +#include "../dialogs/shortcutsettings.h" +#include "../icore.h" #include <utils/qtcassert.h> #include <utils/fileutils.h> diff --git a/src/plugins/coreplugin/actionsfilter.h b/src/plugins/coreplugin/actionsfilter.h index 692dea95d26..25e788abaa5 100644 --- a/src/plugins/coreplugin/actionsfilter.h +++ b/src/plugins/coreplugin/actionsfilter.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/locator/ilocatorfilter.h> +#include "locator/ilocatorfilter.h" #include <QAction> #include <QPointer> diff --git a/src/plugins/coreplugin/basefilewizardfactory.h b/src/plugins/coreplugin/basefilewizardfactory.h index e6b1ed172a6..0d9033d6d59 100644 --- a/src/plugins/coreplugin/basefilewizardfactory.h +++ b/src/plugins/coreplugin/basefilewizardfactory.h @@ -5,8 +5,7 @@ #include "core_global.h" #include "generatedfile.h" - -#include <coreplugin/iwizardfactory.h> +#include "iwizardfactory.h" #include <utils/filepath.h> diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp index 1ac3332288e..c9eabf0a3b4 100644 --- a/src/plugins/coreplugin/coreplugin.cpp +++ b/src/plugins/coreplugin/coreplugin.cpp @@ -14,14 +14,13 @@ #include "session.h" #include "themechooser.h" -#include <coreplugin/actionmanager/actionmanager.h> -#include <coreplugin/documentmanager.h> -#include <coreplugin/editormanager/editormanager.h> -#include <coreplugin/find/findplugin.h> -#include <coreplugin/find/searchresultwindow.h> -#include <coreplugin/locator/locator.h> -#include <coreplugin/coreconstants.h> -#include <coreplugin/fileutils.h> +#include "actionmanager/actionmanager.h" +#include "documentmanager.h" +#include "editormanager/editormanager.h" +#include "find/findplugin.h" +#include "locator/locator.h" +#include "coreconstants.h" +#include "fileutils.h" #include <extensionsystem/pluginerroroverview.h> #include <extensionsystem/pluginmanager.h> diff --git a/src/plugins/coreplugin/designmode.h b/src/plugins/coreplugin/designmode.h index 844bcaf259f..da9a6f70ab6 100644 --- a/src/plugins/coreplugin/designmode.h +++ b/src/plugins/coreplugin/designmode.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/imode.h> +#include "imode.h" namespace Core { class IEditor; diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h index cccab844374..e230cab904c 100644 --- a/src/plugins/coreplugin/dialogs/ioptionspage.h +++ b/src/plugins/coreplugin/dialogs/ioptionspage.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/core_global.h> +#include "../core_global.h" #include <utils/aspects.h> #include <utils/id.h> diff --git a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.h b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.h index 89f22372408..09e717cd270 100644 --- a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.h +++ b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/core_global.h> +#include "../core_global.h" #include <utils/filepath.h> diff --git a/src/plugins/coreplugin/dialogs/restartdialog.h b/src/plugins/coreplugin/dialogs/restartdialog.h index 65646f3389a..c7f8fd43c51 100644 --- a/src/plugins/coreplugin/dialogs/restartdialog.h +++ b/src/plugins/coreplugin/dialogs/restartdialog.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/core_global.h> +#include "../core_global.h" #include <QCoreApplication> #include <QMessageBox> diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.h b/src/plugins/coreplugin/dialogs/shortcutsettings.h index 49297b3d501..36e175ff673 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.h +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.h @@ -3,8 +3,8 @@ #pragma once -#include <coreplugin/actionmanager/commandmappings.h> -#include <coreplugin/dialogs/ioptionspage.h> +#include "../actionmanager/commandmappings.h" +#include "ioptionspage.h" #include <QGridLayout> #include <QKeySequence> diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp index 6bd4554935e..859119dc1c2 100644 --- a/src/plugins/coreplugin/documentmanager.cpp +++ b/src/plugins/coreplugin/documentmanager.cpp @@ -3,25 +3,24 @@ #include "documentmanager.h" +#include "actionmanager/actioncontainer.h" +#include "actionmanager/actionmanager.h" +#include "actionmanager/command.h" #include "coreconstants.h" #include "coreplugintr.h" +#include "diffservice.h" +#include "dialogs/filepropertiesdialog.h" +#include "dialogs/readonlyfilesdialog.h" +#include "dialogs/saveitemsdialog.h" +#include "editormanager/editormanager.h" +#include "editormanager/editormanager_p.h" +#include "editormanager/editorview.h" +#include "editormanager/ieditor.h" +#include "editormanager/ieditorfactory.h" #include "icore.h" #include "idocument.h" #include "idocumentfactory.h" - -#include <coreplugin/actionmanager/actioncontainer.h> -#include <coreplugin/actionmanager/actionmanager.h> -#include <coreplugin/actionmanager/command.h> -#include <coreplugin/diffservice.h> -#include <coreplugin/dialogs/filepropertiesdialog.h> -#include <coreplugin/dialogs/readonlyfilesdialog.h> -#include <coreplugin/dialogs/saveitemsdialog.h> -#include <coreplugin/editormanager/editormanager.h> -#include <coreplugin/editormanager/editormanager_p.h> -#include <coreplugin/editormanager/editorview.h> -#include <coreplugin/editormanager/ieditor.h> -#include <coreplugin/editormanager/ieditorfactory.h> -#include <coreplugin/systemsettings.h> +#include "systemsettings.h" #include <extensionsystem/pluginmanager.h> diff --git a/src/plugins/coreplugin/documentmanager.h b/src/plugins/coreplugin/documentmanager.h index ea40dd43b49..7f6e0eff55b 100644 --- a/src/plugins/coreplugin/documentmanager.h +++ b/src/plugins/coreplugin/documentmanager.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/core_global.h> +#include "core_global.h" #include <utils/filepath.h> #include <utils/id.h> diff --git a/src/plugins/coreplugin/editmode.h b/src/plugins/coreplugin/editmode.h index 06bfdc3bdb9..1e7d36d5e8e 100644 --- a/src/plugins/coreplugin/editmode.h +++ b/src/plugins/coreplugin/editmode.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/imode.h> +#include "imode.h" QT_BEGIN_NAMESPACE class QSplitter; diff --git a/src/plugins/coreplugin/editormanager/editorarea.cpp b/src/plugins/coreplugin/editormanager/editorarea.cpp index e807fb55dd4..2b47988c3b3 100644 --- a/src/plugins/coreplugin/editormanager/editorarea.cpp +++ b/src/plugins/coreplugin/editormanager/editorarea.cpp @@ -6,10 +6,11 @@ #include "editormanager.h" #include "ieditor.h" -#include <coreplugin/coreconstants.h> -#include <coreplugin/icontext.h> -#include <coreplugin/idocument.h> -#include <coreplugin/icore.h> +#include "../coreconstants.h" +#include "../icontext.h" +#include "../icore.h" +#include "../idocument.h" + #include <utils/qtcassert.h> #include <QApplication> diff --git a/src/plugins/coreplugin/editormanager/editormanager_p.h b/src/plugins/coreplugin/editormanager/editormanager_p.h index 1d8aba0b92e..7e3863e5cf6 100644 --- a/src/plugins/coreplugin/editormanager/editormanager_p.h +++ b/src/plugins/coreplugin/editormanager/editormanager_p.h @@ -10,7 +10,7 @@ #include "ieditor.h" #include "ieditorfactory.h" -#include <coreplugin/idocument.h> +#include "../idocument.h" #include <QList> #include <QObject> diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp index c922dae9515..0229116ff85 100644 --- a/src/plugins/coreplugin/editormanager/editorview.cpp +++ b/src/plugins/coreplugin/editormanager/editorview.cpp @@ -7,14 +7,13 @@ #include "editormanager_p.h" #include "documentmodel.h" #include "documentmodel_p.h" +#include "../actionmanager/actionmanager.h" +#include "../editormanager/ieditor.h" +#include "../editortoolbar.h" +#include "../findplaceholder.h" +#include "../icore.h" +#include "../minisplitter.h" -#include <coreplugin/actionmanager/actionmanager.h> -#include <coreplugin/editormanager/ieditor.h> -#include <coreplugin/editortoolbar.h> -#include <coreplugin/findplaceholder.h> -#include <coreplugin/icore.h> -#include <coreplugin/locator/locatorconstants.h> -#include <coreplugin/minisplitter.h> #include <utils/algorithm.h> #include <utils/infobar.h> #include <utils/qtcassert.h> diff --git a/src/plugins/coreplugin/editormanager/editorwindow.cpp b/src/plugins/coreplugin/editormanager/editorwindow.cpp index 0044804e236..3e23a7285ed 100644 --- a/src/plugins/coreplugin/editormanager/editorwindow.cpp +++ b/src/plugins/coreplugin/editormanager/editorwindow.cpp @@ -5,13 +5,13 @@ #include "editorarea.h" #include "editormanager_p.h" +#include "../coreconstants.h" +#include "../icontext.h" +#include "../icore.h" +#include "../locator/locatormanager.h" +#include "../minisplitter.h" #include <aggregation/aggregate.h> -#include <coreplugin/coreconstants.h> -#include <coreplugin/icontext.h> -#include <coreplugin/icore.h> -#include <coreplugin/locator/locatormanager.h> -#include <coreplugin/minisplitter.h> #include <utils/qtcassert.h> #include <QStatusBar> diff --git a/src/plugins/coreplugin/editormanager/ieditor.h b/src/plugins/coreplugin/editormanager/ieditor.h index 01415844231..2d8bd4b6db4 100644 --- a/src/plugins/coreplugin/editormanager/ieditor.h +++ b/src/plugins/coreplugin/editormanager/ieditor.h @@ -3,8 +3,8 @@ #pragma once -#include <coreplugin/core_global.h> -#include <coreplugin/icontext.h> +#include "../core_global.h" +#include "../icontext.h" #include <QMetaType> diff --git a/src/plugins/coreplugin/editormanager/ieditorfactory.h b/src/plugins/coreplugin/editormanager/ieditorfactory.h index 29b07f384ff..ddc27eebc33 100644 --- a/src/plugins/coreplugin/editormanager/ieditorfactory.h +++ b/src/plugins/coreplugin/editormanager/ieditorfactory.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/core_global.h> +#include "../core_global.h" #include <utils/id.h> diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.h b/src/plugins/coreplugin/editormanager/openeditorsview.h index 0ba5a41961c..013ff538d69 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsview.h +++ b/src/plugins/coreplugin/editormanager/openeditorsview.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/inavigationwidgetfactory.h> +#include "../inavigationwidgetfactory.h" namespace Core::Internal { diff --git a/src/plugins/coreplugin/externaltool.h b/src/plugins/coreplugin/externaltool.h index d92d6099bc9..15b420f1808 100644 --- a/src/plugins/coreplugin/externaltool.h +++ b/src/plugins/coreplugin/externaltool.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/core_global.h> +#include "core_global.h" #include <utils/environment.h> #include <utils/filepath.h> diff --git a/src/plugins/coreplugin/find/findplugin.cpp b/src/plugins/coreplugin/find/findplugin.cpp index 69679798b79..5cf8eedd2e7 100644 --- a/src/plugins/coreplugin/find/findplugin.cpp +++ b/src/plugins/coreplugin/find/findplugin.cpp @@ -8,6 +8,7 @@ #include "findtoolwindow.h" #include "ifindfilter.h" #include "searchresultwindow.h" +#include "textfindconstants.h" #include "../actionmanager/actioncontainer.h" #include "../actionmanager/actionmanager.h" #include "../actionmanager/command.h" diff --git a/src/plugins/coreplugin/find/findplugin.h b/src/plugins/coreplugin/find/findplugin.h index 54a3c7234e3..2ddb9b797a4 100644 --- a/src/plugins/coreplugin/find/findplugin.h +++ b/src/plugins/coreplugin/find/findplugin.h @@ -3,7 +3,7 @@ #pragma once -#include "textfindconstants.h" +#include "../core_global.h" #include <utils/filesearch.h> diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp index 187243ab4f9..caece8a0737 100644 --- a/src/plugins/coreplugin/find/findtoolbar.cpp +++ b/src/plugins/coreplugin/find/findtoolbar.cpp @@ -6,11 +6,11 @@ #include "ifindfilter.h" #include "findplugin.h" #include "optionspopup.h" +#include "textfindconstants.h" #include "../actionmanager/actioncontainer.h" #include "../actionmanager/actionmanager.h" #include "../actionmanager/command.h" #include "../coreicons.h" -#include "../coreplugin.h" #include "../coreplugintr.h" #include "../findplaceholder.h" #include "../icontext.h" diff --git a/src/plugins/coreplugin/find/highlightscrollbarcontroller.h b/src/plugins/coreplugin/find/highlightscrollbarcontroller.h index 60177ae20a5..3b14c9269a4 100644 --- a/src/plugins/coreplugin/find/highlightscrollbarcontroller.h +++ b/src/plugins/coreplugin/find/highlightscrollbarcontroller.h @@ -3,15 +3,15 @@ #pragma once -#include <QHash> -#include <QPointer> -#include <QVector> - -#include <coreplugin/core_global.h> +#include "../core_global.h" #include <utils/id.h> #include <utils/theme/theme.h> +#include <QHash> +#include <QPointer> +#include <QVector> + QT_BEGIN_NAMESPACE class QAbstractScrollArea; class QScrollBar; diff --git a/src/plugins/coreplugin/find/ifindfilter.h b/src/plugins/coreplugin/find/ifindfilter.h index b8df36e536e..107439fdfd8 100644 --- a/src/plugins/coreplugin/find/ifindfilter.h +++ b/src/plugins/coreplugin/find/ifindfilter.h @@ -3,7 +3,7 @@ #pragma once -#include "textfindconstants.h" +#include "../core_global.h" #include <utils/filesearch.h> diff --git a/src/plugins/coreplugin/find/ifindsupport.h b/src/plugins/coreplugin/find/ifindsupport.h index c9509b79f3a..39ed5b5af6d 100644 --- a/src/plugins/coreplugin/find/ifindsupport.h +++ b/src/plugins/coreplugin/find/ifindsupport.h @@ -3,7 +3,7 @@ #pragma once -#include "textfindconstants.h" +#include "../core_global.h" #include <utils/filesearch.h> diff --git a/src/plugins/coreplugin/find/itemviewfind.cpp b/src/plugins/coreplugin/find/itemviewfind.cpp index 9cb9125b1ef..2fe4ae31003 100644 --- a/src/plugins/coreplugin/find/itemviewfind.cpp +++ b/src/plugins/coreplugin/find/itemviewfind.cpp @@ -3,8 +3,9 @@ #include "itemviewfind.h" +#include "../findplaceholder.h" + #include <aggregation/aggregate.h> -#include <coreplugin/findplaceholder.h> #include <QModelIndex> #include <QTextCursor> diff --git a/src/plugins/coreplugin/find/optionspopup.cpp b/src/plugins/coreplugin/find/optionspopup.cpp index 9f5f11ad2d0..2f61ebdbb2c 100644 --- a/src/plugins/coreplugin/find/optionspopup.cpp +++ b/src/plugins/coreplugin/find/optionspopup.cpp @@ -3,7 +3,7 @@ #include "optionspopup.h" -#include <coreplugin/actionmanager/actionmanager.h> +#include "../actionmanager/actionmanager.h" #include <utils/qtcassert.h> diff --git a/src/plugins/coreplugin/find/optionspopup.h b/src/plugins/coreplugin/find/optionspopup.h index 3356dc50556..329e97db9d0 100644 --- a/src/plugins/coreplugin/find/optionspopup.h +++ b/src/plugins/coreplugin/find/optionspopup.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/core_global.h> +#include "../core_global.h" #include <utils/id.h> diff --git a/src/plugins/coreplugin/find/searchresultwindow.h b/src/plugins/coreplugin/find/searchresultwindow.h index 1aac86070c4..c2b7a13b273 100644 --- a/src/plugins/coreplugin/find/searchresultwindow.h +++ b/src/plugins/coreplugin/find/searchresultwindow.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/ioutputpane.h> +#include "../ioutputpane.h" #include <utils/searchresultitem.h> diff --git a/src/plugins/coreplugin/find/textfindconstants.h b/src/plugins/coreplugin/find/textfindconstants.h index 83e9888dfca..e058ae4df2e 100644 --- a/src/plugins/coreplugin/find/textfindconstants.h +++ b/src/plugins/coreplugin/find/textfindconstants.h @@ -3,8 +3,6 @@ #pragma once -#include <coreplugin/core_global.h> - #include <QMetaType> #include <QFlags> #include <QTextDocument> diff --git a/src/plugins/coreplugin/foldernavigationwidget.cpp b/src/plugins/coreplugin/foldernavigationwidget.cpp index 5df76f44a4d..82101df8131 100644 --- a/src/plugins/coreplugin/foldernavigationwidget.cpp +++ b/src/plugins/coreplugin/foldernavigationwidget.cpp @@ -7,7 +7,6 @@ #include "actionmanager/command.h" #include "coreicons.h" #include "coreplugintr.h" -#include "diffservice.h" #include "documentmanager.h" #include "editormanager/editormanager.h" #include "editormanager/ieditor.h" @@ -19,8 +18,6 @@ #include <extensionsystem/pluginmanager.h> -#include <texteditor/textdocument.h> - #include <utils/algorithm.h> #include <utils/filecrumblabel.h> #include <utils/filepath.h> diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp index f0d2046a32f..07b539da91e 100644 --- a/src/plugins/coreplugin/generalsettings.cpp +++ b/src/plugins/coreplugin/generalsettings.cpp @@ -1,15 +1,14 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +#include "dialogs/restartdialog.h" +#include "dialogs/ioptionspage.h" #include "generalsettings.h" #include "coreconstants.h" #include "coreplugintr.h" #include "icore.h" #include "themechooser.h" -#include <coreplugin/dialogs/restartdialog.h> -#include <coreplugin/dialogs/ioptionspage.h> - #include <extensionsystem/pluginmanager.h> #include <utils/algorithm.h> diff --git a/src/plugins/coreplugin/iwizardfactory.h b/src/plugins/coreplugin/iwizardfactory.h index 26dfe8bbd85..e9771f7aa1d 100644 --- a/src/plugins/coreplugin/iwizardfactory.h +++ b/src/plugins/coreplugin/iwizardfactory.h @@ -3,8 +3,8 @@ #pragma once -#include <coreplugin/core_global.h> -#include <coreplugin/featureprovider.h> +#include "core_global.h" +#include "featureprovider.h" #include <QIcon> #include <QObject> diff --git a/src/plugins/coreplugin/locator/commandlocator.cpp b/src/plugins/coreplugin/locator/commandlocator.cpp index e960b4df85d..b740bdeeacd 100644 --- a/src/plugins/coreplugin/locator/commandlocator.cpp +++ b/src/plugins/coreplugin/locator/commandlocator.cpp @@ -3,7 +3,7 @@ #include "commandlocator.h" -#include <coreplugin/actionmanager/command.h> +#include "../actionmanager/command.h" #include <utils/stringutils.h> diff --git a/src/plugins/coreplugin/locator/directoryfilter.h b/src/plugins/coreplugin/locator/directoryfilter.h index 485377d2a15..452a1b20e75 100644 --- a/src/plugins/coreplugin/locator/directoryfilter.h +++ b/src/plugins/coreplugin/locator/directoryfilter.h @@ -3,10 +3,9 @@ #pragma once +#include "../core_global.h" #include "ilocatorfilter.h" -#include <coreplugin/core_global.h> - namespace Core { class CORE_EXPORT DirectoryFilter : public ILocatorFilter diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.h b/src/plugins/coreplugin/locator/ilocatorfilter.h index fbc68bc647c..57da6a2d85f 100644 --- a/src/plugins/coreplugin/locator/ilocatorfilter.h +++ b/src/plugins/coreplugin/locator/ilocatorfilter.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/core_global.h> +#include "../core_global.h" #include <solutions/tasking/tasktree.h> diff --git a/src/plugins/coreplugin/locator/javascriptfilter.h b/src/plugins/coreplugin/locator/javascriptfilter.h index 8b7112fd27d..f5013285cc1 100644 --- a/src/plugins/coreplugin/locator/javascriptfilter.h +++ b/src/plugins/coreplugin/locator/javascriptfilter.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/locator/ilocatorfilter.h> +#include "ilocatorfilter.h" class JavaScriptEngine; diff --git a/src/plugins/coreplugin/locator/locator.h b/src/plugins/coreplugin/locator/locator.h index 45d4b650508..e2069e99e99 100644 --- a/src/plugins/coreplugin/locator/locator.h +++ b/src/plugins/coreplugin/locator/locator.h @@ -4,15 +4,13 @@ #pragma once #include "ilocatorfilter.h" +#include "../actionmanager/command.h" -#include <coreplugin/actionmanager/command.h> #include <extensionsystem/iplugin.h> #include <QObject> #include <QTimer> -#include <functional> - namespace Tasking { class TaskTree; } namespace Core { diff --git a/src/plugins/coreplugin/locator/locator_test.cpp b/src/plugins/coreplugin/locator/locator_test.cpp index c83a2d8779c..26a6b142b02 100644 --- a/src/plugins/coreplugin/locator/locator_test.cpp +++ b/src/plugins/coreplugin/locator/locator_test.cpp @@ -2,10 +2,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "../coreplugin.h" - +#include "../testdatadir.h" #include "locatorfiltertest.h" -#include <coreplugin/testdatadir.h> #include <utils/algorithm.h> #include <utils/fileutils.h> diff --git a/src/plugins/coreplugin/locator/locatormanager.cpp b/src/plugins/coreplugin/locator/locatormanager.cpp index d8ea9b36f9e..e4fc9edfc36 100644 --- a/src/plugins/coreplugin/locator/locatormanager.cpp +++ b/src/plugins/coreplugin/locator/locatormanager.cpp @@ -6,9 +6,9 @@ #include "ilocatorfilter.h" #include "locator.h" #include "locatorwidget.h" +#include "../icore.h" #include <aggregation/aggregate.h> -#include <coreplugin/icore.h> #include <extensionsystem/pluginmanager.h> #include <utils/qtcassert.h> diff --git a/src/plugins/coreplugin/locator/locatormanager.h b/src/plugins/coreplugin/locator/locatormanager.h index 256e4327643..0b17de23a10 100644 --- a/src/plugins/coreplugin/locator/locatormanager.h +++ b/src/plugins/coreplugin/locator/locatormanager.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/core_global.h> +#include "../core_global.h" #include <QObject> diff --git a/src/plugins/coreplugin/locator/locatorsettingspage.h b/src/plugins/coreplugin/locator/locatorsettingspage.h index 408fe7b91f8..b4f9e4a4a33 100644 --- a/src/plugins/coreplugin/locator/locatorsettingspage.h +++ b/src/plugins/coreplugin/locator/locatorsettingspage.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/dialogs/ioptionspage.h> +#include "../dialogs/ioptionspage.h" namespace Core::Internal { diff --git a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp index 95e076ec2bd..a13f51484bf 100644 --- a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp +++ b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp @@ -4,8 +4,7 @@ #include "opendocumentsfilter.h" #include "../coreplugintr.h" - -#include <coreplugin/editormanager/documentmodel.h> +#include "../editormanager/documentmodel.h" #include <extensionsystem/pluginmanager.h> diff --git a/src/plugins/coreplugin/locator/urllocatorfilter.h b/src/plugins/coreplugin/locator/urllocatorfilter.h index 57f652aeca1..18535569c5b 100644 --- a/src/plugins/coreplugin/locator/urllocatorfilter.h +++ b/src/plugins/coreplugin/locator/urllocatorfilter.h @@ -5,7 +5,7 @@ #include "ilocatorfilter.h" -#include <coreplugin/core_global.h> +#include "../core_global.h" #include <QDialog> diff --git a/src/plugins/coreplugin/mimetypesettings.h b/src/plugins/coreplugin/mimetypesettings.h index fd4a69685e3..1080b0746b9 100644 --- a/src/plugins/coreplugin/mimetypesettings.h +++ b/src/plugins/coreplugin/mimetypesettings.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/dialogs/ioptionspage.h> +#include "dialogs/ioptionspage.h" namespace Core::Internal { diff --git a/src/plugins/coreplugin/modemanager.h b/src/plugins/coreplugin/modemanager.h index 5f013ffa507..5e90edb16bc 100644 --- a/src/plugins/coreplugin/modemanager.h +++ b/src/plugins/coreplugin/modemanager.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/core_global.h> +#include "core_global.h" #include <utils/id.h> diff --git a/src/plugins/coreplugin/navigationwidget.h b/src/plugins/coreplugin/navigationwidget.h index dd36fe90811..d89105e75d9 100644 --- a/src/plugins/coreplugin/navigationwidget.h +++ b/src/plugins/coreplugin/navigationwidget.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/minisplitter.h> +#include "minisplitter.h" #include <utils/id.h> #include <utils/store.h> diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.h b/src/plugins/coreplugin/progressmanager/futureprogress.h index 5687fa95a15..d2b9e7facb0 100644 --- a/src/plugins/coreplugin/progressmanager/futureprogress.h +++ b/src/plugins/coreplugin/progressmanager/futureprogress.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/core_global.h> +#include "../core_global.h" #include <utils/id.h> diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.h b/src/plugins/coreplugin/progressmanager/progressmanager.h index 8c51bf4ccd4..99580436ca2 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.h +++ b/src/plugins/coreplugin/progressmanager/progressmanager.h @@ -3,7 +3,7 @@ #pragma once -#include <coreplugin/core_global.h> +#include "../core_global.h" #include <utils/id.h> diff --git a/src/plugins/coreplugin/progressmanager/progressmanager_win.cpp b/src/plugins/coreplugin/progressmanager/progressmanager_win.cpp index 58e350506ce..64e9fdfc5a8 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager_win.cpp +++ b/src/plugins/coreplugin/progressmanager/progressmanager_win.cpp @@ -1,6 +1,12 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +#include "progressmanager_p.h" + +#include "../icore.h" + +#include <utils/utilsicons.h> + #include <QGuiApplication> #include <QVariant> #include <QMainWindow> @@ -12,11 +18,6 @@ #include <QLabel> #include <qpa/qplatformnativeinterface.h> -#include <coreplugin/icore.h> -#include <utils/utilsicons.h> - -#include "progressmanager_p.h" - // for windows progress bar #ifndef __GNUC__ # define CALLBACK WINAPI diff --git a/src/plugins/coreplugin/rightpane.cpp b/src/plugins/coreplugin/rightpane.cpp index 24322b6b00b..d4f8f7aa250 100644 --- a/src/plugins/coreplugin/rightpane.cpp +++ b/src/plugins/coreplugin/rightpane.cpp @@ -3,8 +3,7 @@ #include "rightpane.h" -#include <coreplugin/imode.h> -#include <coreplugin/modemanager.h> +#include "modemanager.h" #include <utils/qtcsettings.h> diff --git a/src/plugins/coreplugin/session.cpp b/src/plugins/coreplugin/session.cpp index f94afa97f9e..541ff527402 100644 --- a/src/plugins/coreplugin/session.cpp +++ b/src/plugins/coreplugin/session.cpp @@ -17,8 +17,6 @@ #include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginspec.h> -#include <texteditor/texteditor.h> - #include <utils/algorithm.h> #include <utils/filepath.h> #include <utils/macroexpander.h> diff --git a/src/plugins/coreplugin/sessionmodel.cpp b/src/plugins/coreplugin/sessionmodel.cpp index fa0d8ee087e..1d97762eb0f 100644 --- a/src/plugins/coreplugin/sessionmodel.cpp +++ b/src/plugins/coreplugin/sessionmodel.cpp @@ -3,11 +3,10 @@ #include "sessionmodel.h" +#include "actionmanager/actionmanager.h" #include "session.h" #include "sessiondialog.h" -#include <coreplugin/actionmanager/actionmanager.h> - #include <utils/algorithm.h> #include <utils/fileutils.h> #include <utils/stringutils.h> diff --git a/src/plugins/coreplugin/textdocument.cpp b/src/plugins/coreplugin/textdocument.cpp index ddbf05fb18b..cf4dd82939e 100644 --- a/src/plugins/coreplugin/textdocument.cpp +++ b/src/plugins/coreplugin/textdocument.cpp @@ -2,7 +2,8 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "textdocument.h" -#include <coreplugin/editormanager/editormanager.h> + +#include "editormanager/editormanager.h" #include <QDebug> #include <QTextCodec> diff --git a/src/plugins/coreplugin/themechooser.h b/src/plugins/coreplugin/themechooser.h index 1188fcb7e0d..360be3100c0 100644 --- a/src/plugins/coreplugin/themechooser.h +++ b/src/plugins/coreplugin/themechooser.h @@ -3,9 +3,9 @@ #pragma once -#include <utils/id.h> +#include "dialogs/ioptionspage.h" -#include <coreplugin/dialogs/ioptionspage.h> +#include <utils/id.h> #include <QWidget> diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp index 4b5e60b2fcc..ce4138721fc 100644 --- a/src/plugins/coreplugin/vcsmanager.cpp +++ b/src/plugins/coreplugin/vcsmanager.cpp @@ -18,8 +18,6 @@ #include <utils/infobar.h> #include <utils/qtcassert.h> -#include <vcsbase/vcsbaseconstants.h> - #include <QList> #include <QMap> #include <QMessageBox> diff --git a/src/plugins/cppeditor/cppeditorwidget.h b/src/plugins/cppeditor/cppeditorwidget.h index e9c0d11275c..a379c5f55b4 100644 --- a/src/plugins/cppeditor/cppeditorwidget.h +++ b/src/plugins/cppeditor/cppeditorwidget.h @@ -5,6 +5,7 @@ #include "cppeditor_global.h" +#include <texteditor/blockrange.h> #include <texteditor/codeassist/assistenums.h> #include <texteditor/texteditor.h> diff --git a/src/plugins/cppeditor/symbolsfindfilter.cpp b/src/plugins/cppeditor/symbolsfindfilter.cpp index ef067876825..54a0e6a6463 100644 --- a/src/plugins/cppeditor/symbolsfindfilter.cpp +++ b/src/plugins/cppeditor/symbolsfindfilter.cpp @@ -7,11 +7,12 @@ #include "cppeditortr.h" #include "cppmodelmanager.h" +#include <coreplugin/editormanager/editormanager.h> +#include <coreplugin/find/searchresultwindow.h> +#include <coreplugin/find/textfindconstants.h> #include <coreplugin/icore.h> #include <coreplugin/progressmanager/futureprogress.h> #include <coreplugin/progressmanager/progressmanager.h> -#include <coreplugin/editormanager/editormanager.h> -#include <coreplugin/find/searchresultwindow.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> diff --git a/src/plugins/terminal/terminalwidget.cpp b/src/plugins/terminal/terminalwidget.cpp index 3cf390f51cc..681ad9c538f 100644 --- a/src/plugins/terminal/terminalwidget.cpp +++ b/src/plugins/terminal/terminalwidget.cpp @@ -12,6 +12,7 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/fileutils.h> +#include <coreplugin/find/textfindconstants.h> #include <coreplugin/icore.h> #include <coreplugin/messagemanager.h> diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index 24b802857bf..91c0b8e259a 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -13,6 +13,7 @@ #include <coreplugin/documentmanager.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/find/ifindsupport.h> +#include <coreplugin/find/textfindconstants.h> #include <coreplugin/icore.h> #include <coreplugin/progressmanager/futureprogress.h> #include <coreplugin/progressmanager/progressmanager.h> diff --git a/src/plugins/texteditor/texteditor.h b/src/plugins/texteditor/texteditor.h index 4f0ea99c8d4..6be08ae3cb7 100644 --- a/src/plugins/texteditor/texteditor.h +++ b/src/plugins/texteditor/texteditor.h @@ -5,7 +5,6 @@ #include "texteditor_global.h" -#include "blockrange.h" #include "codeassist/assistenums.h" #include "indenter.h" #include "refactoroverlay.h" |