diff options
Diffstat (limited to 'src')
167 files changed, 393 insertions, 528 deletions
diff --git a/src/app/app.qbs b/src/app/app.qbs index c995ed5042..0ad34dc40e 100644 --- a/src/app/app.qbs +++ b/src/app/app.qbs @@ -13,11 +13,8 @@ Application { return ["-Wl,-s"] } cpp.includePaths: [ - "..", - "../libs", "../shared/qtsingleapplication", "../shared/qtlockedfile", - buildDirectory ] Depends { name: "app_version_header" } diff --git a/src/app/main.cpp b/src/app/main.cpp index c7317caa2f..81d9ff84f9 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -27,7 +27,6 @@ ** ****************************************************************************/ -#include "qtsingleapplication.h" #include "../tools/qtcreatorcrashhandler/crashhandlersetup.h" #include <app/app_version.h> @@ -35,6 +34,7 @@ #include <extensionsystem/pluginerroroverview.h> #include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginspec.h> +#include <qtsingleapplication.h> #include <QDebug> #include <QDir> diff --git a/src/libs/3rdparty/cplusplus/cplusplus.pri b/src/libs/3rdparty/cplusplus/cplusplus.pri index e179f54c89..004ef4014e 100644 --- a/src/libs/3rdparty/cplusplus/cplusplus.pri +++ b/src/libs/3rdparty/cplusplus/cplusplus.pri @@ -1,7 +1,3 @@ - -DEPENDPATH += $$PWD -INCLUDEPATH += $$PWD - HEADERS += \ $$PWD/cppassert.h \ $$PWD/CPlusPlus.h \ diff --git a/src/libs/QtcLibrary.qbs b/src/libs/QtcLibrary.qbs index a90826df3b..131c319a28 100644 --- a/src/libs/QtcLibrary.qbs +++ b/src/libs/QtcLibrary.qbs @@ -19,11 +19,11 @@ DynamicLibrary { cpp.rpaths: qbs.targetOS.contains("osx") ? ["@loader_path/..", "@executable_path/.."] : ["$ORIGIN", "$ORIGIN/.."] - cpp.includePaths: [ ".", ".." ] + cpp.includePaths: [path] Export { Depends { name: "cpp" } - cpp.includePaths: [ "." ] + cpp.includePaths: [path] } Group { diff --git a/src/libs/languageutils/languageutils-lib.pri b/src/libs/languageutils/languageutils-lib.pri index 6eaa315814..aab3ac1bb4 100644 --- a/src/libs/languageutils/languageutils-lib.pri +++ b/src/libs/languageutils/languageutils-lib.pri @@ -4,8 +4,6 @@ contains(CONFIG, dll) { DEFINES += LANGUAGEUTILS_BUILD_STATIC_LIB } -INCLUDEPATH += $$PWD/.. - HEADERS += \ $$PWD/languageutils_global.h \ $$PWD/fakemetaobject.h \ diff --git a/src/libs/languageutils/languageutils.qbs b/src/libs/languageutils/languageutils.qbs index 88bc82979e..3f4a53e93c 100644 --- a/src/libs/languageutils/languageutils.qbs +++ b/src/libs/languageutils/languageutils.qbs @@ -4,7 +4,6 @@ import "../QtcLibrary.qbs" as QtcLibrary QtcLibrary { name: "LanguageUtils" - cpp.includePaths: base.concat("../3rdparty/cplusplus") cpp.defines: base.concat([ "LANGUAGEUTILS_BUILD_DIR" ]) diff --git a/src/libs/qmldebug/qmldebug-lib.pri b/src/libs/qmldebug/qmldebug-lib.pri index 54f09258b0..9afd866e79 100644 --- a/src/libs/qmldebug/qmldebug-lib.pri +++ b/src/libs/qmldebug/qmldebug-lib.pri @@ -4,8 +4,6 @@ contains(CONFIG, dll) { DEFINES += QMLDEBUG_STATIC_LIB } -INCLUDEPATH += $$PWD/.. - HEADERS += \ $$PWD/qmlprofilereventlocation.h \ $$PWD/qmldebugclient.h \ diff --git a/src/libs/qmleditorwidgets/contextpanetext.ui b/src/libs/qmleditorwidgets/contextpanetext.ui index d3d77f9425..8a1ceb862a 100644 --- a/src/libs/qmleditorwidgets/contextpanetext.ui +++ b/src/libs/qmleditorwidgets/contextpanetext.ui @@ -438,12 +438,12 @@ <customwidget> <class>QmlEditorWidgets::ColorButton</class> <extends>QToolButton</extends> - <header location="global">colorbutton.h</header> + <header location="global">qmleditorwidgets/colorbutton.h</header> </customwidget> <customwidget> <class>QmlEditorWidgets::FontSizeSpinBox</class> <extends>QSpinBox</extends> - <header location="global">fontsizespinbox.h</header> + <header location="global">qmleditorwidgets/fontsizespinbox.h</header> </customwidget> </customwidgets> <resources/> diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp index 683bef38d1..c2f826da38 100644 --- a/src/libs/qmleditorwidgets/contextpanewidget.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp @@ -43,11 +43,11 @@ #include <QGraphicsEffect> #include <QAction> #include "contextpanetextwidget.h" -#include "easingcontextpane.h" #include "contextpanewidgetimage.h" #include "contextpanewidgetrectangle.h" #include "customcolordialog.h" #include "colorbutton.h" +#include <qmleditorwidgets/easingpane/easingcontextpane.h> using namespace Utils; diff --git a/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui b/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui index fc849a02b2..df35b99cdd 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui +++ b/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui @@ -300,7 +300,7 @@ <customwidget> <class>QmlEditorWidgets::FileWidget</class> <extends>QComboBox</extends> - <header location="global">filewidget.h</header> + <header location="global">qmleditorwidgets/filewidget.h</header> </customwidget> </customwidgets> <resources> diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.ui b/src/libs/qmleditorwidgets/contextpanewidgetimage.ui index dc0587de5b..ed25fbf0fd 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetimage.ui +++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.ui @@ -285,7 +285,7 @@ <customwidget> <class>QmlEditorWidgets::FileWidget</class> <extends>QComboBox</extends> - <header location="global">filewidget.h</header> + <header location="global">qmleditorwidgets/filewidget.h</header> </customwidget> </customwidgets> <resources> diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp index eca08408a5..40a8a80d66 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp @@ -30,9 +30,9 @@ #include "contextpanewidgetrectangle.h" #include "ui_contextpanewidgetrectangle.h" #include "contextpanewidget.h" +#include "customcolordialog.h" #include <qmljs/qmljspropertyreader.h> #include <qmljs/qmljsutils.h> -#include <customcolordialog.h> #include <QDebug> namespace QmlEditorWidgets { diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.ui b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.ui index 43e2c735f7..1f2ba9f39b 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.ui +++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.ui @@ -298,12 +298,12 @@ <customwidget> <class>QmlEditorWidgets::ColorButton</class> <extends>QToolButton</extends> - <header location="global">colorbutton.h</header> + <header location="global">qmleditorwidgets/colorbutton.h</header> </customwidget> <customwidget> <class>QmlEditorWidgets::GradientLine</class> <extends>QWidget</extends> - <header location="global">gradientline.h</header> + <header location="global">qmleditorwidgets/gradientline.h</header> <container>1</container> </customwidget> </customwidgets> diff --git a/src/libs/qmleditorwidgets/easingpane/easingpane.pri b/src/libs/qmleditorwidgets/easingpane/easingpane.pri index fc6b057d81..a1c04cda4b 100644 --- a/src/libs/qmleditorwidgets/easingpane/easingpane.pri +++ b/src/libs/qmleditorwidgets/easingpane/easingpane.pri @@ -1,5 +1,4 @@ VPATH += $$PWD -INCLUDEPATH += $$PWD SOURCES += $$PWD/easinggraph.cpp \ $$PWD/easingcontextpane.cpp diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri b/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri index da748cf52d..fdaf629f7a 100644 --- a/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri +++ b/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri @@ -1,7 +1,5 @@ QT += script declarative -INCLUDEPATH += $$PWD - contains(CONFIG, dll) { DEFINES += BUILD_QMLEDITORWIDGETS_LIB } else { diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs index 45502583ef..a8a3ebc2c1 100644 --- a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs +++ b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs @@ -4,7 +4,6 @@ import "../QtcLibrary.qbs" as QtcLibrary QtcLibrary { name: "QmlEditorWidgets" - cpp.includePaths: base.concat(easingPane.prefix) cpp.defines: base.concat([ "QWEAKPOINTER_ENABLE_ARROW", "BUILD_QMLEDITORWIDGETS_LIB" diff --git a/src/libs/qmljs/qmljs-lib.pri b/src/libs/qmljs/qmljs-lib.pri index 12913de0a5..1ea154d3ad 100644 --- a/src/libs/qmljs/qmljs-lib.pri +++ b/src/libs/qmljs/qmljs-lib.pri @@ -6,8 +6,6 @@ contains(CONFIG, dll) { include(parser/parser.pri) -INCLUDEPATH += $$PWD/.. - HEADERS += \ $$PWD/qmljs_global.h \ $$PWD/qmljsbind.h \ diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs index a5a14daff0..8df00b7ed4 100644 --- a/src/libs/qmljs/qmljs.qbs +++ b/src/libs/qmljs/qmljs.qbs @@ -4,7 +4,6 @@ import "../QtcLibrary.qbs" as QtcLibrary QtcLibrary { name: "QmlJS" - cpp.includePaths: base.concat("parser") cpp.defines: base.concat([ "QMLJS_BUILD_DIR" ]) diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri index 99545fcb38..15ef919407 100644 --- a/src/libs/utils/utils-lib.pri +++ b/src/libs/utils/utils-lib.pri @@ -4,7 +4,6 @@ dll { DEFINES += QTCREATOR_UTILS_STATIC_LIB } -INCLUDEPATH += $$PWD QT += script network CONFIG += exceptions # used by portlist.cpp, textfileformat.cpp, and ssh/* diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs index fcd6533e99..830d41b385 100644 --- a/src/plugins/QtcPlugin.qbs +++ b/src/plugins/QtcPlugin.qbs @@ -26,7 +26,7 @@ Product { if (qbs.buildVariant == "release" && (qbs.toolchain.contains("gcc") || qbs.toolchain.contains("mingw"))) return ["-Wl,-s"] } - cpp.includePaths: [ ".", ".." ] + cpp.includePaths: [path] Group { name: "PluginSpec" @@ -47,5 +47,7 @@ Product { Export { Depends { name: "ExtensionSystem" } + Depends { name: "cpp" } + cpp.includePaths: [path] } } diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs index b852ba43c4..b9c02f78cc 100644 --- a/src/plugins/android/android.qbs +++ b/src/plugins/android/android.qbs @@ -22,7 +22,6 @@ QtcPlugin { property bool enable: false pluginspecreplacements: ({"ANDROID_EXPERIMENTAL_STR": (enable ? "false": "true")}) - cpp.includePaths: base.concat("../../shared") cpp.defines: base.concat(project.buildQbsProjectManager ? ['HAVE_QBS'] : []) files: [ diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp index 1d7da8f5b4..e3567b2fbb 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp +++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp @@ -30,8 +30,8 @@ #include "actioncontainer_p.h" #include "actionmanager.h" -#include "coreconstants.h" -#include "id.h" +#include <coreplugin/coreconstants.h> +#include <coreplugin/id.h> #include <utils/hostosinfo.h> #include <utils/qtcassert.h> diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp index 287b2e0f59..5eb2161db7 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp +++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp @@ -29,10 +29,10 @@ #include "actionmanager.h" #include "actionmanager_p.h" -#include "mainwindow.h" #include "actioncontainer_p.h" #include "command_p.h" -#include "id.h" +#include <coreplugin/id.h> +#include <coreplugin/mainwindow.h> #include <utils/qtcassert.h> diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp index 08e0f9cf8e..2646b091c8 100644 --- a/src/plugins/coreplugin/actionmanager/command.cpp +++ b/src/plugins/coreplugin/actionmanager/command.cpp @@ -29,8 +29,8 @@ #include "command_p.h" -#include "icontext.h" -#include "id.h" +#include <coreplugin/icontext.h> +#include <coreplugin/id.h> #include <utils/hostosinfo.h> diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.cpp b/src/plugins/coreplugin/actionmanager/commandmappings.cpp index b3cb20f23f..ee17ff370f 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.cpp +++ b/src/plugins/coreplugin/actionmanager/commandmappings.cpp @@ -28,9 +28,9 @@ ****************************************************************************/ #include "commandmappings.h" -#include "shortcutsettings.h" #include "ui_commandmappings.h" #include "commandsfile.h" +#include <coreplugin/dialogs/shortcutsettings.h> #include <utils/hostosinfo.h> #include <utils/headerviewstretcher.h> diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.cpp b/src/plugins/coreplugin/actionmanager/commandsfile.cpp index a75ce5c80e..5d91694862 100644 --- a/src/plugins/coreplugin/actionmanager/commandsfile.cpp +++ b/src/plugins/coreplugin/actionmanager/commandsfile.cpp @@ -28,8 +28,8 @@ ****************************************************************************/ #include "commandsfile.h" -#include "shortcutsettings.h" #include "command_p.h" +#include <coreplugin/dialogs/shortcutsettings.h> #include <app/app_version.h> diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp index 0a477daee9..4090601a4c 100644 --- a/src/plugins/coreplugin/coreplugin.cpp +++ b/src/plugins/coreplugin/coreplugin.cpp @@ -28,16 +28,16 @@ ****************************************************************************/ #include "coreplugin.h" -#include "actionmanager.h" #include "designmode.h" #include "editmode.h" -#include "editormanager.h" #include "fileiconprovider.h" #include "helpmanager.h" #include "mainwindow.h" #include "mimedatabase.h" #include "modemanager.h" #include "infobar.h" +#include <coreplugin/actionmanager/actionmanager.h> +#include <coreplugin/editormanager/editormanager.h> #include <utils/savefile.h> diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro index 053ab3af54..6f283d19ac 100644 --- a/src/plugins/coreplugin/coreplugin.pro +++ b/src/plugins/coreplugin/coreplugin.pro @@ -12,10 +12,6 @@ greaterThan(QT_MAJOR_VERSION, 4) { include(../../qtcreatorplugin.pri) include(../../shared/scriptwrapper/scriptwrapper.pri) win32-msvc*:QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250 -INCLUDEPATH += dialogs \ - actionmanager \ - editormanager \ - progressmanager SOURCES += mainwindow.cpp \ editmode.cpp \ tabpositionindicator.cpp \ diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs index 216113bcc5..c645f68439 100644 --- a/src/plugins/coreplugin/coreplugin.qbs +++ b/src/plugins/coreplugin/coreplugin.qbs @@ -15,15 +15,6 @@ QtcPlugin { Depends { name: "Aggregation" } Depends { name: "app_version_header" } - cpp.includePaths: base.concat([ - "../..", - "../../shared/scriptwrapper", - "dialogs", - "editormanager", - "progressmanager", - "actionmanager" - ]) - cpp.dynamicLibraries: { if (qbs.targetOS.contains("windows")) return [ "ole32", diff --git a/src/plugins/coreplugin/dialogs/iwizard.cpp b/src/plugins/coreplugin/dialogs/iwizard.cpp index 9fdb675fba..d6134c8dba 100644 --- a/src/plugins/coreplugin/dialogs/iwizard.cpp +++ b/src/plugins/coreplugin/dialogs/iwizard.cpp @@ -28,8 +28,8 @@ ****************************************************************************/ #include "iwizard.h" -#include "icore.h" -#include "featureprovider.h" +#include <coreplugin/icore.h> +#include <coreplugin/featureprovider.h> #include <extensionsystem/pluginmanager.h> diff --git a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp index 7ce8378dde..9c2350c321 100644 --- a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp +++ b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp @@ -27,11 +27,11 @@ ** ****************************************************************************/ -#include "fileiconprovider.h" #include "readonlyfilesdialog.h" #include "ui_readonlyfilesdialog.h" #include <coreplugin/editormanager/editormanager.h> +#include <coreplugin/fileiconprovider.h> #include <coreplugin/icore.h> #include <coreplugin/idocument.h> #include <coreplugin/iversioncontrol.h> diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp index 97f37e0d96..bb6783bcda 100644 --- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp @@ -29,7 +29,7 @@ #include "settingsdialog.h" -#include "icore.h" +#include <coreplugin/icore.h> #include <extensionsystem/pluginmanager.h> #include <utils/hostosinfo.h> diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp index 60fb4a89a6..26aebb407d 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp @@ -28,14 +28,14 @@ ****************************************************************************/ #include "shortcutsettings.h" -#include "actionmanager/actionmanager.h" -#include "actionmanager/command.h" -#include "command_p.h" -#include "commandsfile.h" -#include "coreconstants.h" -#include "documentmanager.h" -#include "icore.h" -#include "id.h" +#include <coreplugin/coreconstants.h> +#include <coreplugin/documentmanager.h> +#include <coreplugin/icore.h> +#include <coreplugin/id.h> +#include <coreplugin/actionmanager/actionmanager.h> +#include <coreplugin/actionmanager/command.h> +#include <coreplugin/actionmanager/command_p.h> +#include <coreplugin/actionmanager/commandsfile.h> #include <QKeyEvent> #include <QFileDialog> diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp index 91636da98f..ee56bb5593 100644 --- a/src/plugins/coreplugin/documentmanager.cpp +++ b/src/plugins/coreplugin/documentmanager.cpp @@ -29,17 +29,17 @@ #include "documentmanager.h" -#include "editormanager.h" #include "icore.h" -#include "ieditor.h" -#include "ieditorfactory.h" -#include "iexternaleditor.h" #include "idocument.h" #include "mimedatabase.h" -#include "saveitemsdialog.h" #include "coreconstants.h" -#include "dialogs/readonlyfilesdialog.h" +#include <coreplugin/dialogs/readonlyfilesdialog.h> +#include <coreplugin/dialogs/saveitemsdialog.h> +#include <coreplugin/editormanager/editormanager.h> +#include <coreplugin/editormanager/ieditor.h> +#include <coreplugin/editormanager/ieditorfactory.h> +#include <coreplugin/editormanager/iexternaleditor.h> #include <utils/hostosinfo.h> #include <utils/qtcassert.h> diff --git a/src/plugins/coreplugin/editmode.cpp b/src/plugins/coreplugin/editmode.cpp index ce77f78c69..7eae044731 100644 --- a/src/plugins/coreplugin/editmode.cpp +++ b/src/plugins/coreplugin/editmode.cpp @@ -28,14 +28,14 @@ ****************************************************************************/ #include "editmode.h" -#include "editormanager.h" #include "coreconstants.h" #include "modemanager.h" #include "minisplitter.h" #include "outputpane.h" #include "navigationwidget.h" #include "rightpane.h" -#include "ieditor.h" +#include <coreplugin/editormanager/editormanager.h> +#include <coreplugin/editormanager/ieditor.h> #include <QLatin1String> #include <QHBoxLayout> diff --git a/src/plugins/coreplugin/editormanager/documentmodel.cpp b/src/plugins/coreplugin/editormanager/documentmodel.cpp index 5de2ef54f7..737b2fc5fa 100644 --- a/src/plugins/coreplugin/editormanager/documentmodel.cpp +++ b/src/plugins/coreplugin/editormanager/documentmodel.cpp @@ -29,7 +29,7 @@ #include "documentmodel.h" #include "ieditor.h" -#include "idocument.h" +#include <coreplugin/idocument.h> #include <utils/qtcassert.h> diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 19bc92c944..b75a9ab6c3 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -29,34 +29,34 @@ #include "editormanager.h" #include "editorview.h" -#include "findplaceholder.h" #include "openeditorswindow.h" #include "openeditorsview.h" #include "documentmodel.h" -#include "openwithdialog.h" -#include "outputpane.h" -#include "outputpanemanager.h" -#include "rightpane.h" -#include "documentmanager.h" -#include "icore.h" #include "ieditor.h" -#include "iversioncontrol.h" -#include "mimedatabase.h" -#include "vcsmanager.h" #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/coreconstants.h> +#include <coreplugin/dialogs/openwithdialog.h> +#include <coreplugin/dialogs/readonlyfilesdialog.h> +#include <coreplugin/documentmanager.h> #include <coreplugin/editormanager/ieditorfactory.h> #include <coreplugin/editormanager/iexternaleditor.h> #include <coreplugin/editortoolbar.h> #include <coreplugin/fileutils.h> +#include <coreplugin/findplaceholder.h> +#include <coreplugin/icore.h> #include <coreplugin/icorelistener.h> #include <coreplugin/infobar.h> +#include <coreplugin/iversioncontrol.h> +#include <coreplugin/mimedatabase.h> #include <coreplugin/modemanager.h> +#include <coreplugin/outputpane.h> +#include <coreplugin/outputpanemanager.h> +#include <coreplugin/rightpane.h> #include <coreplugin/settingsdatabase.h> #include <coreplugin/variablemanager.h> -#include <coreplugin/dialogs/readonlyfilesdialog.h> +#include <coreplugin/vcsmanager.h> #include <extensionsystem/pluginmanager.h> diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp index 5d0931a8bf..ce25cf04a8 100644 --- a/src/plugins/coreplugin/editormanager/editorview.cpp +++ b/src/plugins/coreplugin/editormanager/editorview.cpp @@ -29,13 +29,13 @@ #include "editorview.h" #include "editormanager.h" -#include "icore.h" -#include "minisplitter.h" #include "documentmodel.h" #include <coreplugin/editortoolbar.h> #include <coreplugin/coreconstants.h> +#include <coreplugin/icore.h> #include <coreplugin/infobar.h> +#include <coreplugin/minisplitter.h> #include <coreplugin/editormanager/ieditor.h> #include <coreplugin/findplaceholder.h> diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp index 21dc7b8722..19693e9820 100644 --- a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp +++ b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp @@ -31,7 +31,7 @@ #include "documentmodel.h" #include "editormanager.h" #include "editorview.h" -#include "idocument.h" +#include <coreplugin/idocument.h> #include <utils/hostosinfo.h> #include <utils/qtcassert.h> diff --git a/src/plugins/coreplugin/editormanager/systemeditor.cpp b/src/plugins/coreplugin/editormanager/systemeditor.cpp index 5e77f4aa3d..f2424f359c 100644 --- a/src/plugins/coreplugin/editormanager/systemeditor.cpp +++ b/src/plugins/coreplugin/editormanager/systemeditor.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ #include "systemeditor.h" -#include "id.h" +#include <coreplugin/id.h> #include <QStringList> #include <QUrl> diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 004a2d234c..35f47b4c04 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -28,32 +28,21 @@ ****************************************************************************/ #include "mainwindow.h" -#include "actioncontainer.h" -#include "command.h" -#include "actionmanager.h" -#include "actionmanager_p.h" #include "icore.h" #include "coreconstants.h" -#include "editormanager.h" #include "toolsettings.h" #include "mimetypesettings.h" #include "fancytabwidget.h" #include "documentmanager.h" #include "generalsettings.h" #include "helpmanager.h" -#include "ieditor.h" #include "idocumentfactory.h" #include "messagemanager.h" #include "modemanager.h" #include "mimedatabase.h" -#include "newdialog.h" #include "outputpanemanager.h" #include "plugindialog.h" -#include "progressmanager_p.h" -#include "progressview.h" -#include "shortcutsettings.h" #include "vcsmanager.h" -#include "settingsdialog.h" #include "variablemanager.h" #include "versiondialog.h" #include "statusbarmanager.h" @@ -71,8 +60,19 @@ #endif #include <app/app_version.h> +#include <coreplugin/actionmanager/actioncontainer.h> +#include <coreplugin/actionmanager/actionmanager.h> +#include <coreplugin/actionmanager/actionmanager_p.h> +#include <coreplugin/actionmanager/command.h> +#include <coreplugin/dialogs/newdialog.h> +#include <coreplugin/dialogs/settingsdialog.h> +#include <coreplugin/dialogs/shortcutsettings.h> +#include <coreplugin/editormanager/editormanager.h> +#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/icorelistener.h> #include <coreplugin/inavigationwidgetfactory.h> +#include <coreplugin/progressmanager/progressmanager_p.h> +#include <coreplugin/progressmanager/progressview.h> #include <coreplugin/settingsdatabase.h> #include <utils/historycompleter.h> #include <utils/hostosinfo.h> diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp index 742e1a2db0..61a079cd92 100644 --- a/src/plugins/coreplugin/mimetypesettings.cpp +++ b/src/plugins/coreplugin/mimetypesettings.cpp @@ -28,14 +28,14 @@ ****************************************************************************/ #include "coreconstants.h" -#include "editormanager.h" #include "icore.h" -#include "ieditorfactory.h" -#include "iexternaleditor.h" #include "mimedatabase.h" #include "mimetypemagicdialog.h" #include "mimetypesettings.h" #include "ui_mimetypesettingspage.h" +#include <coreplugin/editormanager/editormanager.h> +#include <coreplugin/editormanager/ieditorfactory.h> +#include <coreplugin/editormanager/iexternaleditor.h> #include <QAbstractTableModel> #include <QCoreApplication> diff --git a/src/plugins/coreplugin/mimetypesettings.h b/src/plugins/coreplugin/mimetypesettings.h index 485068167b..19908aeeb6 100644 --- a/src/plugins/coreplugin/mimetypesettings.h +++ b/src/plugins/coreplugin/mimetypesettings.h @@ -30,7 +30,7 @@ #ifndef MIMETYPESETTINGSPAGE_H #define MIMETYPESETTINGSPAGE_H -#include "ioptionspage.h" +#include <coreplugin/dialogs/ioptionspage.h> namespace Core { namespace Internal { diff --git a/src/plugins/coreplugin/textdocument.cpp b/src/plugins/coreplugin/textdocument.cpp index 4f2bdf0b23..e210cbb6a2 100644 --- a/src/plugins/coreplugin/textdocument.cpp +++ b/src/plugins/coreplugin/textdocument.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ #include "textdocument.h" -#include "editormanager.h" +#include <coreplugin/editormanager/editormanager.h> #include <QDebug> #include <QTextCodec> diff --git a/src/plugins/coreplugin/toolsettings.h b/src/plugins/coreplugin/toolsettings.h index 89bd4d680a..c161436de9 100644 --- a/src/plugins/coreplugin/toolsettings.h +++ b/src/plugins/coreplugin/toolsettings.h @@ -30,7 +30,7 @@ #ifndef TOOLSETTINGS_H #define TOOLSETTINGS_H -#include "ioptionspage.h" +#include <coreplugin/dialogs/ioptionspage.h> #include <QPointer> diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp index 0fe9543f4b..4a92abc289 100644 --- a/src/plugins/coreplugin/vcsmanager.cpp +++ b/src/plugins/coreplugin/vcsmanager.cpp @@ -31,12 +31,12 @@ #include "iversioncontrol.h" #include "icore.h" #include "documentmanager.h" -#include "editormanager.h" -#include "ieditor.h" #include "idocument.h" #include "infobar.h" -#include "addtovcsdialog.h" +#include <coreplugin/dialogs/addtovcsdialog.h> +#include <coreplugin/editormanager/editormanager.h> +#include <coreplugin/editormanager/ieditor.h> #include <vcsbase/vcsbaseconstants.h> #include <extensionsystem/pluginmanager.h> diff --git a/src/plugins/cpaster/frontend/frontend.qbs b/src/plugins/cpaster/frontend/frontend.qbs index 748e6a6d96..70be0e9f00 100644 --- a/src/plugins/cpaster/frontend/frontend.qbs +++ b/src/plugins/cpaster/frontend/frontend.qbs @@ -9,8 +9,8 @@ QtcTool { submodules: ["gui", "network"] } Depends { name: "Core" } + Depends { name: "CppTools" } - cpp.includePaths: ["../../"] cpp.rpaths: [ "$ORIGIN/../lib/qtcreator", "$ORIGIN/../lib/qtcreator/plugins", diff --git a/src/plugins/cpaster/pasteview.ui b/src/plugins/cpaster/pasteview.ui index 714826778a..aa7675fb0a 100644 --- a/src/plugins/cpaster/pasteview.ui +++ b/src/plugins/cpaster/pasteview.ui @@ -216,7 +216,7 @@ p, li { white-space: pre-wrap; } <customwidget> <class>CodePaster::ColumnIndicatorTextEdit</class> <extends>QTextEdit</extends> - <header>columnindicatortextedit.h</header> + <header location="global">cpaster/columnindicatortextedit.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs index 96e685b128..8d9f0525a8 100644 --- a/src/plugins/cppeditor/cppeditor.qbs +++ b/src/plugins/cppeditor/cppeditor.qbs @@ -14,8 +14,6 @@ QtcPlugin { Depends { name: "TextEditor" } Depends { name: "ProjectExplorer" } - cpp.includePaths: base.concat("../../libs/3rdparty") - files: [ "cppautocompleter.cpp", "cppautocompleter.h", diff --git a/src/plugins/debugger/cdb/cdb.pri b/src/plugins/debugger/cdb/cdb.pri index f1928c0b3c..2191c4150b 100644 --- a/src/plugins/debugger/cdb/cdb.pri +++ b/src/plugins/debugger/cdb/cdb.pri @@ -10,4 +10,3 @@ SOURCES += $$PWD/cdbengine.cpp \ FORMS += cdb/cdboptionspagewidget.ui -INCLUDEPATH*=$$PWD diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index aa9e36c28a..c9e894a443 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -29,28 +29,29 @@ #include "cdbengine.h" -#include "breakhandler.h" #include "bytearrayinputstream.h" #include "cdboptionspage.h" #include "cdbparsehelpers.h" -#include "debuggeractions.h" -#include "debuggercore.h" -#include "debuggerprotocol.h" -#include "debuggermainwindow.h" -#include "debuggerstartparameters.h" -#include "debuggertooltipmanager.h" -#include "disassembleragent.h" -#include "disassemblerlines.h" -#include "memoryagent.h" -#include "moduleshandler.h" -#include "registerhandler.h" -#include "stackhandler.h" -#include "threadshandler.h" -#include "watchhandler.h" -#include "shared/cdbsymbolpathlisteditor.h" -#include "shared/hostutils.h" -#include "procinterrupt.h" -#include "sourceutils.h" + +#include <debugger/breakhandler.h> +#include <debugger/debuggeractions.h> +#include <debugger/debuggercore.h> +#include <debugger/debuggerprotocol.h> +#include <debugger/debuggermainwindow.h> +#include <debugger/debuggerstartparameters.h> +#include <debugger/debuggertooltipmanager.h> +#include <debugger/disassembleragent.h> +#include <debugger/disassemblerlines.h> +#include <debugger/memoryagent.h> +#include <debugger/moduleshandler.h> +#include <debugger/registerhandler.h> +#include <debugger/stackhandler.h> +#include <debugger/threadshandler.h> +#include <debugger/watchhandler.h> +#include <debugger/procinterrupt.h> +#include <debugger/sourceutils.h> +#include <debugger/shared/cdbsymbolpathlisteditor.h> +#include <debugger/shared/hostutils.h> #include <coreplugin/icore.h> #include <projectexplorer/taskhub.h> diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h index 48af1aa464..097407c3f8 100644 --- a/src/plugins/debugger/cdb/cdbengine.h +++ b/src/plugins/debugger/cdb/cdbengine.h @@ -30,7 +30,7 @@ #ifndef DEBUGGER_CDBENGINE_H #define DEBUGGER_CDBENGINE_H -#include "debuggerengine.h" +#include <debugger/debuggerengine.h> #include <QSharedPointer> #include <QProcess> diff --git a/src/plugins/debugger/cdb/cdboptionspage.cpp b/src/plugins/debugger/cdb/cdboptionspage.cpp index 648a4cd746..e3b6c4cd33 100644 --- a/src/plugins/debugger/cdb/cdboptionspage.cpp +++ b/src/plugins/debugger/cdb/cdboptionspage.cpp @@ -28,12 +28,12 @@ ****************************************************************************/ #include "cdboptionspage.h" -#include "commonoptionspage.h" -#include "debuggeractions.h" -#include "debuggercore.h" -#include "debuggerinternalconstants.h" #include "cdbengine.h" -#include "cdbsymbolpathlisteditor.h" +#include <debugger/commonoptionspage.h> +#include <debugger/debuggeractions.h> +#include <debugger/debuggercore.h> +#include <debugger/debuggerinternalconstants.h> +#include <debugger/shared/cdbsymbolpathlisteditor.h> #include <coreplugin/icore.h> diff --git a/src/plugins/debugger/cdb/cdbparsehelpers.cpp b/src/plugins/debugger/cdb/cdbparsehelpers.cpp index 755b3c61ec..b7ca47d663 100644 --- a/src/plugins/debugger/cdb/cdbparsehelpers.cpp +++ b/src/plugins/debugger/cdb/cdbparsehelpers.cpp @@ -30,10 +30,11 @@ #include "cdbparsehelpers.h" #include "bytearrayinputstream.h" -#include "debuggerprotocol.h" -#include "disassemblerlines.h" -#include "shared/hostutils.h" -#include "threaddata.h" + +#include <debugger/debuggerprotocol.h> +#include <debugger/disassemblerlines.h> +#include <debugger/shared/hostutils.h> +#include <debugger/threaddata.h> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/cdb/cdbparsehelpers.h b/src/plugins/debugger/cdb/cdbparsehelpers.h index 2d95fc8904..4d046f30fe 100644 --- a/src/plugins/debugger/cdb/cdbparsehelpers.h +++ b/src/plugins/debugger/cdb/cdbparsehelpers.h @@ -30,7 +30,7 @@ #ifndef CDBPARSEHELPERS_H #define CDBPARSEHELPERS_H -#include "breakpoint.h" +#include <debugger/breakpoint.h> #include <QPair> diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs index f0b8ae0b34..4b2a8c81fd 100644 --- a/src/plugins/debugger/debugger.qbs +++ b/src/plugins/debugger/debugger.qbs @@ -18,12 +18,7 @@ QtcPlugin { Depends { name: "QtcSsh" } Depends { name: "Utils" } - cpp.includePaths: base.concat([ - "shared", - lldblib.prefix, - "../../shared/json", - "../../shared/registryaccess" - ]) + cpp.includePaths: base.concat(["../../shared/registryaccess"]) pluginRecommends: [ "CppEditor" @@ -283,6 +278,5 @@ QtcPlugin { Export { Depends { name: "cpp" } Depends { name: "QtcSsh" } - cpp.includePaths: ["."] } } diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index e6964d4a1f..9822f193ce 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -40,12 +40,12 @@ #include "disassembleragent.h" #include "memoryagent.h" #include "moduleshandler.h" -#include "peutils.h" #include "registerhandler.h" #include "sourcefileshandler.h" #include "stackhandler.h" #include "threadshandler.h" #include "watchhandler.h" +#include <debugger/shared/peutils.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 5aa338b165..3e31fedcd7 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -61,8 +61,8 @@ #include "debuggertooltipmanager.h" #include "localsandexpressionswindow.h" #include "loadcoredialog.h" -#include "hostutils.h" #include "sourceutils.h" +#include <debugger/shared/hostutils.h> #include "snapshothandler.h" #include "threadshandler.h" diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index cc7588bd59..fff5ba4ab6 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -42,7 +42,7 @@ #include "breakhandler.h" #ifdef Q_OS_WIN -# include "peutils.h" +# include "shared/peutils.h" # include <utils/winutils.h> #endif diff --git a/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp b/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp index dc39a49f67..51e31ef8c2 100644 --- a/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp +++ b/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp @@ -29,11 +29,11 @@ #include "abstractplaingdbadapter.h" -#include "debuggeractions.h" -#include "debuggercore.h" -#include "debuggerprotocol.h" -#include "debuggerstartparameters.h" -#include "debuggerstringutils.h" +#include <debugger/debuggeractions.h> +#include <debugger/debuggercore.h> +#include <debugger/debuggerprotocol.h> +#include <debugger/debuggerstartparameters.h> +#include <debugger/debuggerstringutils.h> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/gdb/attachgdbadapter.cpp b/src/plugins/debugger/gdb/attachgdbadapter.cpp index bd4cd51694..c9f577d58a 100644 --- a/src/plugins/debugger/gdb/attachgdbadapter.cpp +++ b/src/plugins/debugger/gdb/attachgdbadapter.cpp @@ -29,9 +29,9 @@ #include "attachgdbadapter.h" -#include "debuggerprotocol.h" -#include "debuggerstringutils.h" -#include "debuggerstartparameters.h" +#include <debugger/debuggerprotocol.h> +#include <debugger/debuggerstringutils.h> +#include <debugger/debuggerstartparameters.h> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/gdb/classicgdbengine.cpp b/src/plugins/debugger/gdb/classicgdbengine.cpp index baede63b58..8e01de03d3 100644 --- a/src/plugins/debugger/gdb/classicgdbengine.cpp +++ b/src/plugins/debugger/gdb/classicgdbengine.cpp @@ -29,13 +29,13 @@ #include "gdbengine.h" -#include "debuggeractions.h" -#include "debuggercore.h" -#include "debuggerprotocol.h" -#include "debuggerstartparameters.h" -#include "debuggerstringutils.h" -#include "sourceutils.h" -#include "stackhandler.h" +#include <debugger/debuggeractions.h> +#include <debugger/debuggercore.h> +#include <debugger/debuggerprotocol.h> +#include <debugger/debuggerstartparameters.h> +#include <debugger/debuggerstringutils.h> +#include <debugger/sourceutils.h> +#include <debugger/stackhandler.h> #include <coreplugin/icore.h> #include <projectexplorer/projectexplorerconstants.h> diff --git a/src/plugins/debugger/gdb/coregdbadapter.cpp b/src/plugins/debugger/gdb/coregdbadapter.cpp index 7807f1567c..ce66963e52 100644 --- a/src/plugins/debugger/gdb/coregdbadapter.cpp +++ b/src/plugins/debugger/gdb/coregdbadapter.cpp @@ -29,10 +29,10 @@ #include "coregdbadapter.h" -#include "debuggercore.h" -#include "debuggerprotocol.h" -#include "debuggerstartparameters.h" -#include "debuggerstringutils.h" +#include <debugger/debuggercore.h> +#include <debugger/debuggerprotocol.h> +#include <debugger/debuggerstartparameters.h> +#include <debugger/debuggerstringutils.h> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index c8f0a62824..cf137270aa 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -29,10 +29,6 @@ #include "gdbengine.h" -#include "debuggerstartparameters.h" -#include "debuggerinternalconstants.h" -#include "debuggerruncontrolfactory.h" -#include "disassemblerlines.h" #include "attachgdbadapter.h" #include "coregdbadapter.h" #include "localplaingdbadapter.h" @@ -40,28 +36,34 @@ #include "remotegdbserveradapter.h" #include "remoteplaingdbadapter.h" -#include "debuggeractions.h" -#include "debuggercore.h" -#include "debuggermainwindow.h" -#include "debuggerplugin.h" -#include "debuggerprotocol.h" -#include "debuggerstringutils.h" -#include "debuggertooltipmanager.h" -#include "disassembleragent.h" #include "gdboptionspage.h" -#include "memoryagent.h" -#include "sourceutils.h" - -#include "breakhandler.h" -#include "moduleshandler.h" -#include "registerhandler.h" -#include "sourcefileshandler.h" -#include "stackhandler.h" -#include "threadshandler.h" -#include "debuggersourcepathmappingwidget.h" -#include "hostutils.h" -#include "logwindow.h" -#include "procinterrupt.h" + +#include <debugger/debuggerstartparameters.h> +#include <debugger/debuggerinternalconstants.h> +#include <debugger/debuggerruncontrolfactory.h> +#include <debugger/disassemblerlines.h> + +#include <debugger/debuggeractions.h> +#include <debugger/debuggercore.h> +#include <debugger/debuggermainwindow.h> +#include <debugger/debuggerplugin.h> +#include <debugger/debuggerprotocol.h> +#include <debugger/debuggerstringutils.h> +#include <debugger/debuggertooltipmanager.h> +#include <debugger/disassembleragent.h> +#include <debugger/memoryagent.h> +#include <debugger/sourceutils.h> + +#include <debugger/breakhandler.h> +#include <debugger/moduleshandler.h> +#include <debugger/registerhandler.h> +#include <debugger/sourcefileshandler.h> +#include <debugger/stackhandler.h> +#include <debugger/threadshandler.h> +#include <debugger/debuggersourcepathmappingwidget.h> +#include <debugger/logwindow.h> +#include <debugger/procinterrupt.h> +#include <debugger/shared/hostutils.h> #include <coreplugin/icore.h> #include <projectexplorer/taskhub.h> diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h index de3f99c4ac..d41c6fcfaf 100644 --- a/src/plugins/debugger/gdb/gdbengine.h +++ b/src/plugins/debugger/gdb/gdbengine.h @@ -30,10 +30,10 @@ #ifndef DEBUGGER_GDBENGINE_H #define DEBUGGER_GDBENGINE_H -#include "debuggerengine.h" +#include <debugger/debuggerengine.h> -#include "watchhandler.h" -#include "watchutils.h" +#include <debugger/watchhandler.h> +#include <debugger/watchutils.h> #include <coreplugin/id.h> diff --git a/src/plugins/debugger/gdb/gdboptionspage.cpp b/src/plugins/debugger/gdb/gdboptionspage.cpp index 162abfdf10..a4a336418f 100644 --- a/src/plugins/debugger/gdb/gdboptionspage.cpp +++ b/src/plugins/debugger/gdb/gdboptionspage.cpp @@ -28,10 +28,10 @@ ****************************************************************************/ #include "gdboptionspage.h" -#include "commonoptionspage.h" -#include "debuggeractions.h" -#include "debuggercore.h" -#include "debuggerinternalconstants.h" +#include <debugger/commonoptionspage.h> +#include <debugger/debuggeractions.h> +#include <debugger/debuggercore.h> +#include <debugger/debuggerinternalconstants.h> #include <coreplugin/icore.h> diff --git a/src/plugins/debugger/gdb/localgdbprocess.cpp b/src/plugins/debugger/gdb/localgdbprocess.cpp index c14eef3a19..f6ad006bbc 100644 --- a/src/plugins/debugger/gdb/localgdbprocess.cpp +++ b/src/plugins/debugger/gdb/localgdbprocess.cpp @@ -29,8 +29,8 @@ #include "localgdbprocess.h" -#include "procinterrupt.h" -#include "debuggerconstants.h" +#include <debugger/procinterrupt.h> +#include <debugger/debuggerconstants.h> #include <utils/qtcprocess.h> diff --git a/src/plugins/debugger/gdb/localplaingdbadapter.cpp b/src/plugins/debugger/gdb/localplaingdbadapter.cpp index ad68efbd17..914a91673d 100644 --- a/src/plugins/debugger/gdb/localplaingdbadapter.cpp +++ b/src/plugins/debugger/gdb/localplaingdbadapter.cpp @@ -29,8 +29,8 @@ #include "localplaingdbadapter.h" -#include "debuggerstartparameters.h" -#include "debuggerstringutils.h" +#include <debugger/debuggerstartparameters.h> +#include <debugger/debuggerstringutils.h> #include <utils/hostosinfo.h> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/gdb/localplaingdbadapter.h b/src/plugins/debugger/gdb/localplaingdbadapter.h index 7163b199f3..6e600afbe5 100644 --- a/src/plugins/debugger/gdb/localplaingdbadapter.h +++ b/src/plugins/debugger/gdb/localplaingdbadapter.h @@ -32,7 +32,7 @@ #include "abstractplaingdbadapter.h" #include "localgdbprocess.h" -#include <outputcollector.h> +#include <debugger/outputcollector.h> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/gdb/pythongdbengine.cpp b/src/plugins/debugger/gdb/pythongdbengine.cpp index 0963d1e9c1..459b4ecfaa 100644 --- a/src/plugins/debugger/gdb/pythongdbengine.cpp +++ b/src/plugins/debugger/gdb/pythongdbengine.cpp @@ -29,13 +29,13 @@ #include "gdbengine.h" -#include "debuggerprotocol.h" -#include "debuggeractions.h" -#include "debuggercore.h" -#include "debuggerstringutils.h" -#include "debuggertooltipmanager.h" +#include <debugger/debuggerprotocol.h> +#include <debugger/debuggeractions.h> +#include <debugger/debuggercore.h> +#include <debugger/debuggerstringutils.h> +#include <debugger/debuggertooltipmanager.h> -#include "stackhandler.h" +#include <debugger/stackhandler.h> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp index 1761e5a898..f87d597898 100644 --- a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp +++ b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp @@ -29,11 +29,11 @@ #include "remotegdbserveradapter.h" -#include "debuggeractions.h" -#include "debuggercore.h" -#include "debuggerprotocol.h" -#include "debuggerstartparameters.h" -#include "debuggerstringutils.h" +#include <debugger/debuggeractions.h> +#include <debugger/debuggercore.h> +#include <debugger/debuggerprotocol.h> +#include <debugger/debuggerstartparameters.h> +#include <debugger/debuggerstringutils.h> #include <utils/hostosinfo.h> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/gdb/remoteplaingdbadapter.cpp b/src/plugins/debugger/gdb/remoteplaingdbadapter.cpp index d97ac2370b..eb94b6f8a4 100644 --- a/src/plugins/debugger/gdb/remoteplaingdbadapter.cpp +++ b/src/plugins/debugger/gdb/remoteplaingdbadapter.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ #include "remoteplaingdbadapter.h" -#include "debuggerstartparameters.h" +#include <debugger/debuggerstartparameters.h> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/gdb/startgdbserverdialog.cpp b/src/plugins/debugger/gdb/startgdbserverdialog.cpp index 78cb32de37..ce04b6fbee 100644 --- a/src/plugins/debugger/gdb/startgdbserverdialog.cpp +++ b/src/plugins/debugger/gdb/startgdbserverdialog.cpp @@ -29,11 +29,11 @@ #include "startgdbserverdialog.h" -#include "debuggermainwindow.h" -#include "debuggerplugin.h" -#include "debuggerkitinformation.h" -#include "debuggerruncontrolfactory.h" -#include "debuggerstartparameters.h" +#include <debugger/debuggermainwindow.h> +#include <debugger/debuggerplugin.h> +#include <debugger/debuggerkitinformation.h> +#include <debugger/debuggerruncontrolfactory.h> +#include <debugger/debuggerstartparameters.h> #include <projectexplorer/kitchooser.h> #include <projectexplorer/devicesupport/deviceprocesslist.h> diff --git a/src/plugins/debugger/gdb/termgdbadapter.cpp b/src/plugins/debugger/gdb/termgdbadapter.cpp index 65e783238c..48e5ef4378 100644 --- a/src/plugins/debugger/gdb/termgdbadapter.cpp +++ b/src/plugins/debugger/gdb/termgdbadapter.cpp @@ -29,11 +29,11 @@ #include "termgdbadapter.h" -#include "debuggercore.h" -#include "debuggerprotocol.h" -#include "debuggerstartparameters.h" -#include "debuggerstringutils.h" -#include "shared/hostutils.h" +#include <debugger/debuggercore.h> +#include <debugger/debuggerprotocol.h> +#include <debugger/debuggerstartparameters.h> +#include <debugger/debuggerstringutils.h> +#include <debugger/shared/hostutils.h> #include <utils/hostosinfo.h> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/lldb/lldb.pri b/src/plugins/debugger/lldb/lldb.pri index 4d8fd071cb..a60318a624 100644 --- a/src/plugins/debugger/lldb/lldb.pri +++ b/src/plugins/debugger/lldb/lldb.pri @@ -1,5 +1,3 @@ HEADERS += $$PWD/lldbengine.h SOURCES += $$PWD/lldbengine.cpp - -INCLUDEPATH *= $$PWD diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp index 020dfc669f..88c232809c 100644 --- a/src/plugins/debugger/lldb/lldbengine.cpp +++ b/src/plugins/debugger/lldb/lldbengine.cpp @@ -29,24 +29,24 @@ #include "lldbengine.h" -#include "debuggeractions.h" -#include "debuggercore.h" -#include "debuggerdialogs.h" -#include "debuggerplugin.h" -#include "debuggerprotocol.h" -#include "debuggerstartparameters.h" -#include "debuggerstringutils.h" -#include "debuggertooltipmanager.h" - -#include "breakhandler.h" -#include "disassemblerlines.h" -#include "moduleshandler.h" -#include "registerhandler.h" -#include "stackhandler.h" -#include "sourceutils.h" -#include "threadshandler.h" -#include "watchhandler.h" -#include "watchutils.h" +#include <debugger/debuggeractions.h> +#include <debugger/debuggercore.h> +#include <debugger/debuggerdialogs.h> +#include <debugger/debuggerplugin.h> +#include <debugger/debuggerprotocol.h> +#include <debugger/debuggerstartparameters.h> +#include <debugger/debuggerstringutils.h> +#include <debugger/debuggertooltipmanager.h> + +#include <debugger/breakhandler.h> +#include <debugger/disassemblerlines.h> +#include <debugger/moduleshandler.h> +#include <debugger/registerhandler.h> +#include <debugger/stackhandler.h> +#include <debugger/sourceutils.h> +#include <debugger/threadshandler.h> +#include <debugger/watchhandler.h> +#include <debugger/watchutils.h> #include <utils/qtcassert.h> #include <utils/savedaction.h> diff --git a/src/plugins/debugger/lldb/lldbengine.h b/src/plugins/debugger/lldb/lldbengine.h index ff239aeee3..aa8d445074 100644 --- a/src/plugins/debugger/lldb/lldbengine.h +++ b/src/plugins/debugger/lldb/lldbengine.h @@ -30,9 +30,9 @@ #ifndef DEBUGGER_LLDBENGINE #define DEBUGGER_LLDBENGINE -#include "debuggerengine.h" -#include "disassembleragent.h" -#include "memoryagent.h" +#include <debugger/debuggerengine.h> +#include <debugger/disassembleragent.h> +#include <debugger/memoryagent.h> #include <QPointer> #include <QProcess> diff --git a/src/plugins/debugger/lldblib/ipcengineguest.h b/src/plugins/debugger/lldblib/ipcengineguest.h index 88442a67ca..505328aa85 100644 --- a/src/plugins/debugger/lldblib/ipcengineguest.h +++ b/src/plugins/debugger/lldblib/ipcengineguest.h @@ -30,11 +30,11 @@ #ifndef IPCENGINEGUEST_H #define IPCENGINEGUEST_H -#include "breakhandler.h" -#include "debuggerengine.h" -#include "disassemblerlines.h" -#include "stackhandler.h" -#include "threadshandler.h" +#include <debugger/breakhandler.h> +#include <debugger/debuggerengine.h> +#include <debugger/disassemblerlines.h> +#include <debugger/stackhandler.h> +#include <debugger/threadshandler.h> #include <QQueue> #include <QThread> diff --git a/src/plugins/debugger/lldblib/ipcenginehost.cpp b/src/plugins/debugger/lldblib/ipcenginehost.cpp index 0562939916..da48218ee3 100644 --- a/src/plugins/debugger/lldblib/ipcenginehost.cpp +++ b/src/plugins/debugger/lldblib/ipcenginehost.cpp @@ -30,20 +30,20 @@ #include "ipcenginehost.h" #include "ipcengineguest.h" -#include "debuggerstartparameters.h" -#include "breakhandler.h" -#include "breakpoint.h" -#include "disassemblerlines.h" -#include "moduleshandler.h" -#include "registerhandler.h" -#include "stackhandler.h" -#include "watchhandler.h" -#include "watchutils.h" -#include "threadshandler.h" -#include "disassembleragent.h" -#include "memoryagent.h" -#include "debuggerstreamops.h" -#include "debuggercore.h" +#include <debugger/debuggerstartparameters.h> +#include <debugger/breakhandler.h> +#include <debugger/breakpoint.h> +#include <debugger/disassemblerlines.h> +#include <debugger/moduleshandler.h> +#include <debugger/registerhandler.h> +#include <debugger/stackhandler.h> +#include <debugger/watchhandler.h> +#include <debugger/watchutils.h> +#include <debugger/threadshandler.h> +#include <debugger/disassembleragent.h> +#include <debugger/memoryagent.h> +#include <debugger/debuggerstreamops.h> +#include <debugger/debuggercore.h> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/lldblib/ipcenginehost.h b/src/plugins/debugger/lldblib/ipcenginehost.h index 8364d50657..92f847ca44 100644 --- a/src/plugins/debugger/lldblib/ipcenginehost.h +++ b/src/plugins/debugger/lldblib/ipcenginehost.h @@ -30,11 +30,11 @@ #ifndef DEBUGGER_IPCENGINE_HOST_H #define DEBUGGER_IPCENGINE_HOST_H -#include "debuggerengine.h" -#include "threadshandler.h" -#include "stackhandler.h" -#include "breakhandler.h" -#include "sourceagent.h" +#include <debugger/debuggerengine.h> +#include <debugger/threadshandler.h> +#include <debugger/stackhandler.h> +#include <debugger/breakhandler.h> +#include <debugger/sourceagent.h> #include <QQueue> #include <QVariant> diff --git a/src/plugins/debugger/lldblib/lldbenginehost.cpp b/src/plugins/debugger/lldblib/lldbenginehost.cpp index 9b622057b5..538ba66e12 100644 --- a/src/plugins/debugger/lldblib/lldbenginehost.cpp +++ b/src/plugins/debugger/lldblib/lldbenginehost.cpp @@ -29,23 +29,23 @@ #include "lldbenginehost.h" -#include "debuggerstartparameters.h" -#include "debuggeractions.h" -#include "debuggerconstants.h" -#include "debuggerdialogs.h" -#include "debuggerplugin.h" -#include "debuggerstringutils.h" - -#include "breakhandler.h" -#include "breakpoint.h" -#include "moduleshandler.h" -#include "registerhandler.h" -#include "stackhandler.h" -#include "watchhandler.h" -#include "watchutils.h" -#include "threadshandler.h" -#include "disassembleragent.h" -#include "memoryagent.h" +#include <debugger/debuggerstartparameters.h> +#include <debugger/debuggeractions.h> +#include <debugger/debuggerconstants.h> +#include <debugger/debuggerdialogs.h> +#include <debugger/debuggerplugin.h> +#include <debugger/debuggerstringutils.h> + +#include <debugger/breakhandler.h> +#include <debugger/breakpoint.h> +#include <debugger/moduleshandler.h> +#include <debugger/registerhandler.h> +#include <debugger/stackhandler.h> +#include <debugger/watchhandler.h> +#include <debugger/watchutils.h> +#include <debugger/threadshandler.h> +#include <debugger/disassembleragent.h> +#include <debugger/memoryagent.h> #include <coreplugin/icore.h> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/lldblib/lldboptionspage.cpp b/src/plugins/debugger/lldblib/lldboptionspage.cpp index 19b4591b84..e774b9581f 100644 --- a/src/plugins/debugger/lldblib/lldboptionspage.cpp +++ b/src/plugins/debugger/lldblib/lldboptionspage.cpp @@ -28,8 +28,8 @@ ****************************************************************************/ #include "lldboptionspage.h" -#include "debuggerconstants.h" -#include "debuggerinternalconstants.h" +#include <debugger/debuggerconstants.h> +#include <debugger/debuggerinternalconstants.h> #include <coreplugin/icore.h> diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp index 8ff71c8d9e..d244bd3739 100644 --- a/src/plugins/debugger/pdb/pdbengine.cpp +++ b/src/plugins/debugger/pdb/pdbengine.cpp @@ -29,22 +29,22 @@ #include "pdbengine.h" -#include "debuggeractions.h" -#include "debuggercore.h" -#include "debuggerdialogs.h" -#include "debuggerplugin.h" -#include "debuggerprotocol.h" -#include "debuggerstartparameters.h" -#include "debuggerstringutils.h" -#include "debuggertooltipmanager.h" - -#include "breakhandler.h" -#include "moduleshandler.h" -#include "registerhandler.h" -#include "stackhandler.h" -#include "sourceutils.h" -#include "watchhandler.h" -#include "watchutils.h" +#include <debugger/debuggeractions.h> +#include <debugger/debuggercore.h> +#include <debugger/debuggerdialogs.h> +#include <debugger/debuggerplugin.h> +#include <debugger/debuggerprotocol.h> +#include <debugger/debuggerstartparameters.h> +#include <debugger/debuggerstringutils.h> +#include <debugger/debuggertooltipmanager.h> + +#include <debugger/breakhandler.h> +#include <debugger/moduleshandler.h> +#include <debugger/registerhandler.h> +#include <debugger/stackhandler.h> +#include <debugger/sourceutils.h> +#include <debugger/watchhandler.h> +#include <debugger/watchutils.h> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/pdb/pdbengine.h b/src/plugins/debugger/pdb/pdbengine.h index 356b38f7f3..556729f6c7 100644 --- a/src/plugins/debugger/pdb/pdbengine.h +++ b/src/plugins/debugger/pdb/pdbengine.h @@ -30,7 +30,7 @@ #ifndef DEBUGGER_PDBENGINE_H #define DEBUGGER_PDBENGINE_H -#include "debuggerengine.h" +#include <debugger/debuggerengine.h> #include <QProcess> #include <QQueue> diff --git a/src/plugins/debugger/qml/baseqmldebuggerclient.h b/src/plugins/debugger/qml/baseqmldebuggerclient.h index 9aa85a57f8..f356139e77 100644 --- a/src/plugins/debugger/qml/baseqmldebuggerclient.h +++ b/src/plugins/debugger/qml/baseqmldebuggerclient.h @@ -30,7 +30,7 @@ #ifndef BASEQMLDEBUGGERCLIENT_H #define BASEQMLDEBUGGERCLIENT_H -#include "debuggerengine.h" +#include <debugger/debuggerengine.h> #include <qmldebug/qmldebugclient.h> namespace Debugger { diff --git a/src/plugins/debugger/qml/qmladapter.cpp b/src/plugins/debugger/qml/qmladapter.cpp index a5c5810c20..ef7a7434d3 100644 --- a/src/plugins/debugger/qml/qmladapter.cpp +++ b/src/plugins/debugger/qml/qmladapter.cpp @@ -29,7 +29,7 @@ #include "qmladapter.h" -#include "debuggerstringutils.h" +#include <debugger/debuggerstringutils.h> #include "qmlengine.h" #include "qmlv8debuggerclient.h" #include "qscriptdebuggerclient.h" diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index 387548a156..f473e55d87 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -28,11 +28,11 @@ ****************************************************************************/ #include "qmlcppengine.h" -#include "debuggerruncontrolfactory.h" -#include "debuggerstartparameters.h" -#include "stackhandler.h" #include "qmlengine.h" -#include "watchhandler.h" +#include <debugger/debuggerruncontrolfactory.h> +#include <debugger/debuggerstartparameters.h> +#include <debugger/stackhandler.h> +#include <debugger/watchhandler.h> #include <utils/qtcassert.h> #include <texteditor/itexteditor.h> diff --git a/src/plugins/debugger/qml/qmlcppengine.h b/src/plugins/debugger/qml/qmlcppengine.h index c0a0226782..761194f74d 100644 --- a/src/plugins/debugger/qml/qmlcppengine.h +++ b/src/plugins/debugger/qml/qmlcppengine.h @@ -30,7 +30,7 @@ #ifndef QMLCPPENGINE_H #define QMLCPPENGINE_H -#include "debuggerengine.h" +#include <debugger/debuggerengine.h> namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index a4d62a3385..7c33d83f59 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -31,21 +31,21 @@ #include "baseqmldebuggerclient.h" #include "qmlinspectoragent.h" -#include "debuggerstartparameters.h" -#include "debuggeractions.h" -#include "debuggercore.h" -#include "debuggerinternalconstants.h" -#include "debuggermainwindow.h" -#include "debuggerrunner.h" -#include "debuggerstringutils.h" -#include "debuggertooltipmanager.h" -#include "localsandexpressionswindow.h" -#include "watchwindow.h" - -#include "breakhandler.h" -#include "stackhandler.h" -#include "watchhandler.h" -#include "sourcefileshandler.h" +#include <debugger/debuggerstartparameters.h> +#include <debugger/debuggeractions.h> +#include <debugger/debuggercore.h> +#include <debugger/debuggerinternalconstants.h> +#include <debugger/debuggermainwindow.h> +#include <debugger/debuggerrunner.h> +#include <debugger/debuggerstringutils.h> +#include <debugger/debuggertooltipmanager.h> +#include <debugger/localsandexpressionswindow.h> +#include <debugger/watchwindow.h> + +#include <debugger/breakhandler.h> +#include <debugger/stackhandler.h> +#include <debugger/watchhandler.h> +#include <debugger/sourcefileshandler.h> #include <qmljseditor/qmljseditorconstants.h> #include <qmljs/parser/qmljsast_p.h> #include <qmljs/qmljsmodelmanagerinterface.h> diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h index 4eb3807819..d9b5cd0b84 100644 --- a/src/plugins/debugger/qml/qmlengine.h +++ b/src/plugins/debugger/qml/qmlengine.h @@ -30,10 +30,10 @@ #ifndef QMLENGINE_H #define QMLENGINE_H -#include "debuggerengine.h" #include "interactiveinterpreter.h" #include "qmladapter.h" #include "qmlinspectoradapter.h" +#include <debugger/debuggerengine.h> #include <projectexplorer/applicationlauncher.h> #include <qmldebug/qdebugmessageclient.h> diff --git a/src/plugins/debugger/qml/qmlinspectoradapter.cpp b/src/plugins/debugger/qml/qmlinspectoradapter.cpp index 37650cd8a7..57ddb45cb0 100644 --- a/src/plugins/debugger/qml/qmlinspectoradapter.cpp +++ b/src/plugins/debugger/qml/qmlinspectoradapter.cpp @@ -29,13 +29,13 @@ #include "qmlinspectoradapter.h" -#include "debuggeractions.h" -#include "debuggercore.h" -#include "debuggerstringutils.h" #include "qmladapter.h" -#include "debuggerengine.h" #include "qmlinspectoragent.h" #include "qmllivetextpreview.h" +#include <debugger/debuggeractions.h> +#include <debugger/debuggercore.h> +#include <debugger/debuggerstringutils.h> +#include <debugger/debuggerengine.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/icore.h> diff --git a/src/plugins/debugger/qml/qmlinspectoradapter.h b/src/plugins/debugger/qml/qmlinspectoradapter.h index b94e37d542..1bdae26a76 100644 --- a/src/plugins/debugger/qml/qmlinspectoradapter.h +++ b/src/plugins/debugger/qml/qmlinspectoradapter.h @@ -30,7 +30,7 @@ #ifndef QMLINSPECTORADAPTER_H #define QMLINSPECTORADAPTER_H -#include "debuggerconstants.h" +#include <debugger/debuggerconstants.h> #include <coreplugin/icontext.h> #include <qmldebug/qmldebugclient.h> diff --git a/src/plugins/debugger/qml/qmlinspectoragent.cpp b/src/plugins/debugger/qml/qmlinspectoragent.cpp index 8a65a59ab0..68974bf9d4 100644 --- a/src/plugins/debugger/qml/qmlinspectoragent.cpp +++ b/src/plugins/debugger/qml/qmlinspectoragent.cpp @@ -29,11 +29,11 @@ #include "qmlinspectoragent.h" -#include "debuggeractions.h" -#include "debuggercore.h" -#include "debuggerengine.h" -#include "debuggerstringutils.h" -#include "watchhandler.h" +#include <debugger/debuggeractions.h> +#include <debugger/debuggercore.h> +#include <debugger/debuggerengine.h> +#include <debugger/debuggerstringutils.h> +#include <debugger/watchhandler.h> #include <qmldebug/qmldebugconstants.h> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp index 52f1ce3a2c..de8964a185 100644 --- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp +++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp @@ -29,14 +29,14 @@ #include "qmlv8debuggerclient.h" #include "qmlv8debuggerclientconstants.h" -#include "debuggerstringutils.h" - -#include "watchhandler.h" -#include "breakhandler.h" #include "qmlengine.h" -#include "stackhandler.h" -#include "debuggercore.h" -#include "debuggeractions.h" + +#include <debugger/debuggerstringutils.h> +#include <debugger/watchhandler.h> +#include <debugger/breakhandler.h> +#include <debugger/stackhandler.h> +#include <debugger/debuggercore.h> +#include <debugger/debuggeractions.h> #include <utils/qtcassert.h> #include <texteditor/basetexteditor.h> diff --git a/src/plugins/debugger/qml/qscriptdebuggerclient.cpp b/src/plugins/debugger/qml/qscriptdebuggerclient.cpp index 2910f895f3..e01d0e4f9c 100644 --- a/src/plugins/debugger/qml/qscriptdebuggerclient.cpp +++ b/src/plugins/debugger/qml/qscriptdebuggerclient.cpp @@ -28,12 +28,12 @@ ****************************************************************************/ #include "qscriptdebuggerclient.h" -#include "watchhandler.h" -#include "breakhandler.h" #include "qmlengine.h" -#include "stackhandler.h" -#include "debuggercore.h" -#include "debuggerstringutils.h" +#include <debugger/watchhandler.h> +#include <debugger/breakhandler.h> +#include <debugger/stackhandler.h> +#include <debugger/debuggercore.h> +#include <debugger/debuggerstringutils.h> #include <QFileInfo> #include <QMessageBox> diff --git a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp index 617a7c2994..93e06d10b8 100644 --- a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp +++ b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp @@ -34,7 +34,7 @@ #include <utils/pathchooser.h> #include <utils/checkablemessagebox.h> -#include <symbolpathsdialog.h> +#include "symbolpathsdialog.h" #include <QCheckBox> #include <QDir> diff --git a/src/plugins/debugger/shared/shared.pri b/src/plugins/debugger/shared/shared.pri index a0021f598b..d465345522 100644 --- a/src/plugins/debugger/shared/shared.pri +++ b/src/plugins/debugger/shared/shared.pri @@ -10,8 +10,6 @@ HEADERS += $$PWD/backtrace.h \ $$PWD/peutils.h \ shared/symbolpathsdialog.h -INCLUDEPATH += $$PWD - win32-msvc* { # For the Privilege manipulation functions in sharedlibraryinjector.cpp. LIBS += -ladvapi32 diff --git a/src/plugins/designer/cpp/cpp.pri b/src/plugins/designer/cpp/cpp.pri index a30a794022..690ca7fc9f 100644 --- a/src/plugins/designer/cpp/cpp.pri +++ b/src/plugins/designer/cpp/cpp.pri @@ -1,5 +1,3 @@ -INCLUDEPATH+=$$PWD - DEFINES+=CPP_ENABLED HEADERS+=$$PWD/formclasswizardpage.h \ diff --git a/src/plugins/designer/cpp/cppsettingspage.cpp b/src/plugins/designer/cpp/cppsettingspage.cpp index 346c9167ca..cc24f2ca89 100644 --- a/src/plugins/designer/cpp/cppsettingspage.cpp +++ b/src/plugins/designer/cpp/cppsettingspage.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ #include "cppsettingspage.h" -#include "designerconstants.h" +#include <designer/designerconstants.h> #include <QCoreApplication> #include <QTextStream> diff --git a/src/plugins/designer/cpp/cppsettingspage.h b/src/plugins/designer/cpp/cppsettingspage.h index 52fd6751cb..647c7d7d19 100644 --- a/src/plugins/designer/cpp/cppsettingspage.h +++ b/src/plugins/designer/cpp/cppsettingspage.h @@ -31,7 +31,7 @@ #define CPPSETTINGSPAGE_H #include "ui_cppsettingspagewidget.h" -#include "qtdesignerformclasscodegenerator.h" +#include <designer/qtdesignerformclasscodegenerator.h> #include <coreplugin/dialogs/ioptionspage.h> diff --git a/src/plugins/designer/cpp/formclasswizard.cpp b/src/plugins/designer/cpp/formclasswizard.cpp index 582318b54f..2bc5fd27dd 100644 --- a/src/plugins/designer/cpp/formclasswizard.cpp +++ b/src/plugins/designer/cpp/formclasswizard.cpp @@ -29,8 +29,8 @@ #include "formclasswizard.h" #include "formclasswizarddialog.h" -#include "designerconstants.h" -#include "qtdesignerformclasscodegenerator.h" +#include <designer/designerconstants.h> +#include <designer/qtdesignerformclasscodegenerator.h> #include <qtsupport/qtsupportconstants.h> #include <cppeditor/cppeditorconstants.h> diff --git a/src/plugins/designer/cpp/formclasswizarddialog.cpp b/src/plugins/designer/cpp/formclasswizarddialog.cpp index 67c636044f..5d62e35ee9 100644 --- a/src/plugins/designer/cpp/formclasswizarddialog.cpp +++ b/src/plugins/designer/cpp/formclasswizarddialog.cpp @@ -28,9 +28,9 @@ ****************************************************************************/ #include "formclasswizarddialog.h" -#include "formtemplatewizardpage.h" #include "formclasswizardpage.h" #include "formclasswizardparameters.h" +#include <designer/formtemplatewizardpage.h> #include <coreplugin/basefilewizard.h> diff --git a/src/plugins/designer/cpp/formclasswizardparameters.cpp b/src/plugins/designer/cpp/formclasswizardparameters.cpp index 78717c9b3d..f64c097c95 100644 --- a/src/plugins/designer/cpp/formclasswizardparameters.cpp +++ b/src/plugins/designer/cpp/formclasswizardparameters.cpp @@ -28,5 +28,5 @@ ****************************************************************************/ #include "formclasswizardparameters.h" -#include "formtemplatewizardpage.h" +#include <designer/formtemplatewizardpage.h> diff --git a/src/plugins/designer/designer.pro b/src/plugins/designer/designer.pro index 9ca41e110c..c0915e57fc 100644 --- a/src/plugins/designer/designer.pro +++ b/src/plugins/designer/designer.pro @@ -4,8 +4,6 @@ include(../../qtcreatorplugin.pri) include(../../shared/designerintegrationv2/designerintegration.pri) include(cpp/cpp.pri) -INCLUDEPATH += ../../tools/utils - greaterThan(QT_MAJOR_VERSION, 4) { QT += printsupport designer designercomponents-private } else { diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs index ee07ff3267..e0d27b7a4a 100644 --- a/src/plugins/designer/designer.qbs +++ b/src/plugins/designer/designer.qbs @@ -16,7 +16,6 @@ QtcPlugin { cpp.defines: base.concat(["CPP_ENABLED"]) cpp.includePaths: base.concat([ - cppGroup.prefix, sharedSources.prefix ]) @@ -63,7 +62,6 @@ QtcPlugin { Group { name: "cpp" - id: cppGroup prefix: "cpp/" files: [ "cppsettingspage.cpp", "cppsettingspage.h", diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp index ce8bb2df7b..cc83156686 100644 --- a/src/plugins/designer/formeditorplugin.cpp +++ b/src/plugins/designer/formeditorplugin.cpp @@ -33,8 +33,8 @@ #include "formwizard.h" #ifdef CPP_ENABLED -# include "formclasswizard.h" -# include "cppsettingspage.h" +# include "cpp/formclasswizard.h" +# include "cpp/cppsettingspage.h" #endif #include "settingspage.h" diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp index 7e31fcd2b4..699d5cd46f 100644 --- a/src/plugins/designer/qtcreatorintegration.cpp +++ b/src/plugins/designer/qtcreatorintegration.cpp @@ -29,10 +29,10 @@ #include "qtcreatorintegration.h" #include "formwindoweditor.h" -#include "formclasswizardpage.h" #include "formeditorw.h" #include "editordata.h" #include <widgethost.h> +#include <designer/cpp/formclasswizardpage.h> #include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cpptoolsconstants.h> diff --git a/src/plugins/designer/qtdesignerformclasscodegenerator.cpp b/src/plugins/designer/qtdesignerformclasscodegenerator.cpp index 3ba68a498a..fb08bfb1d8 100644 --- a/src/plugins/designer/qtdesignerformclasscodegenerator.cpp +++ b/src/plugins/designer/qtdesignerformclasscodegenerator.cpp @@ -28,8 +28,8 @@ ****************************************************************************/ #include "qtdesignerformclasscodegenerator.h" -#include "formclasswizardparameters.h" #include "formtemplatewizardpage.h" +#include <designer/cpp/formclasswizardparameters.h> #include <utils/codegeneration.h> #include <coreplugin/icore.h> diff --git a/src/plugins/find/find.qbs b/src/plugins/find/find.qbs index bcc177d707..d9f653ae43 100644 --- a/src/plugins/find/find.qbs +++ b/src/plugins/find/find.qbs @@ -8,13 +8,6 @@ QtcPlugin { Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] } Depends { name: "Core" } - cpp.includePaths: base.concat([ - "generichighlighter", - "tooltip", - "snippets", - "codeassist" - ]) - files: [ "basetextfind.cpp", "basetextfind.h", diff --git a/src/plugins/git/gerrit/gerrit.pri b/src/plugins/git/gerrit/gerrit.pri index b06518ec5b..617cd941bf 100644 --- a/src/plugins/git/gerrit/gerrit.pri +++ b/src/plugins/git/gerrit/gerrit.pri @@ -1,5 +1,3 @@ -INCLUDEPATH += $$PWD - SOURCES += $$PWD/gerritdialog.cpp \ $$PWD/gerritmodel.cpp \ $$PWD/gerritparameters.cpp \ diff --git a/src/plugins/git/gitorious/gitorious.pri b/src/plugins/git/gitorious/gitorious.pri index 8678042a26..ec285ed15a 100644 --- a/src/plugins/git/gitorious/gitorious.pri +++ b/src/plugins/git/gitorious/gitorious.pri @@ -1,5 +1,4 @@ QT += network -INCLUDEPATH+=$$PWD HEADERS += $$PWD/gitoriousclonewizard.h \ $$PWD/gitorioushostwizardpage.h \ diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs index 9c236b80cb..1d3cd481ef 100644 --- a/src/plugins/help/help.qbs +++ b/src/plugins/help/help.qbs @@ -20,7 +20,6 @@ QtcPlugin { Depends { name: "Locator" } Depends { name: "app_version_header" } - cpp.defines: { var list = base; if (qtcore.versionMajor >= 5) @@ -29,7 +28,8 @@ QtcPlugin { return list; } - cpp.includePaths: base.concat(sharedSources.prefix) + // We include headers from src/shared/help, and their sources include headers from here... + cpp.includePaths: base.concat([sharedSources.prefix, path]) Group { name: "Sources" diff --git a/src/plugins/locator/locator.qbs b/src/plugins/locator/locator.qbs index a40de132f2..bf45c20b5a 100644 --- a/src/plugins/locator/locator.qbs +++ b/src/plugins/locator/locator.qbs @@ -10,13 +10,6 @@ QtcPlugin { Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] } Depends { name: "Core" } - cpp.includePaths: base.concat([ - "generichighlighter", - "tooltip", - "snippets", - "codeassist" - ]) - files: [ "basefilefilter.cpp", "basefilefilter.h", diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp index 8d4478d626..b9dfe05c8b 100644 --- a/src/plugins/projectexplorer/customwizard/customwizard.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizard.cpp @@ -30,9 +30,9 @@ #include "customwizard.h" #include "customwizardparameters.h" #include "customwizardpage.h" -#include "projectexplorer.h" -#include "baseprojectwizarddialog.h" #include "customwizardscriptgenerator.h" +#include <projectexplorer/projectexplorer.h> +#include <projectexplorer/baseprojectwizarddialog.h> #include <coreplugin/icore.h> #include <coreplugin/messagemanager.h> diff --git a/src/plugins/projectexplorer/customwizard/customwizard.pri b/src/plugins/projectexplorer/customwizard/customwizard.pri index 6b0066cbc6..fa3cf931e2 100644 --- a/src/plugins/projectexplorer/customwizard/customwizard.pri +++ b/src/plugins/projectexplorer/customwizard/customwizard.pri @@ -1,4 +1,3 @@ -INCLUDEPATH *= $$PWD HEADERS += $$PWD/customwizard.h \ $$PWD/customwizardparameters.h \ $$PWD/customwizardpage.h \ diff --git a/src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp b/src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp index 750ac8f32f..01d90f53e4 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp @@ -29,7 +29,7 @@ #include "customwizardpreprocessor.h" #ifdef WITH_TESTS -# include "projectexplorer.h" +# include "../projectexplorer.h" # include <QTest> #endif diff --git a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp index d0e7643e6d..90c6aa8f20 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp +++ b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp @@ -28,11 +28,11 @@ ****************************************************************************/ #include "desktopdevice.h" -#include "projectexplorerconstants.h" #include "desktopdeviceprocess.h" #include "deviceprocesslist.h" #include "localprocesslist.h" #include "desktopdeviceconfigurationwidget.h" +#include <projectexplorer/projectexplorerconstants.h> #include <ssh/sshconnection.h> #include <utils/portlist.h> diff --git a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp index 19120a46ef..155f59e78d 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp +++ b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp @@ -29,7 +29,7 @@ #include "desktopdeviceconfigurationwidget.h" #include "ui_desktopdeviceconfigurationwidget.h" -#include "projectexplorerconstants.h" +#include <projectexplorer/projectexplorerconstants.h> #include <utils/portlist.h> #include <utils/qtcassert.h> diff --git a/src/plugins/projectexplorer/devicesupport/desktopdevicefactory.cpp b/src/plugins/projectexplorer/devicesupport/desktopdevicefactory.cpp index 24e01d9336..ca2817dcb6 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopdevicefactory.cpp +++ b/src/plugins/projectexplorer/devicesupport/desktopdevicefactory.cpp @@ -29,7 +29,7 @@ #include "desktopdevicefactory.h" #include "desktopdevice.h" -#include "projectexplorerconstants.h" +#include <projectexplorer/projectexplorerconstants.h> #include <utils/qtcassert.h> diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp index 06cb6ecccf..4e9f139ba6 100644 --- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp @@ -413,7 +413,7 @@ IDevice::ConstPtr DeviceManager::fromRawPointer(const IDevice *device) const #ifdef WITH_TESTS -#include "projectexplorer.h" +#include <projectexplorer/projectexplorer.h> #include <QSignalSpy> #include <QTest> #include <QUuid> diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp index fc94043b6f..1b13f5d561 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp +++ b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp @@ -27,10 +27,10 @@ ** ****************************************************************************/ -#include "devicesupport/deviceprocessesdialog.h" -#include "devicesupport/deviceprocesslist.h" -#include "kitchooser.h" -#include "kitinformation.h" +#include "deviceprocessesdialog.h" +#include "deviceprocesslist.h" +#include <projectexplorer/kitchooser.h> +#include <projectexplorer/kitinformation.h> #include <utils/filterlineedit.h> #include <utils/qtcassert.h> diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp index 2679225e39..432cfb339f 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp @@ -29,7 +29,6 @@ #include "devicesettingswidget.h" #include "ui_devicesettingswidget.h" -#include "projectexplorerconstants.h" #include "devicefactoryselectiondialog.h" #include "devicemanager.h" #include "devicemanagermodel.h" @@ -38,6 +37,7 @@ #include "idevice.h" #include "idevicefactory.h" #include "idevicewidget.h" +#include <projectexplorer/projectexplorerconstants.h> #include <coreplugin/icore.h> #include <extensionsystem/pluginmanager.h> diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h index f697483165..c953fb9a95 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h +++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h @@ -30,7 +30,7 @@ #ifndef DEVICESETTINGSWIDGET_H #define DEVICESETTINGSWIDGET_H -#include "devicesupport/idevice.h" +#include "idevice.h" #include <QList> #include <QString> diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 08cf75b64e..a8daf6ebba 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -61,7 +61,6 @@ #include "appoutputpane.h" #include "pluginfilefactory.h" #include "processstep.h" -#include "customwizard.h" #include "kitinformation.h" #include "projectfilewizardextension.h" #include "projecttreewidget.h" @@ -77,6 +76,7 @@ #include "miniprojecttargetselector.h" #include "taskhub.h" #include "customtoolchain.h" +#include <projectexplorer/customwizard/customwizard.h> #include "devicesupport/desktopdevice.h" #include "devicesupport/desktopdevicefactory.h" #include "devicesupport/devicemanager.h" diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index e788917991..9959bd3b13 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/src/plugins/projectexplorer/projectexplorer.qbs @@ -14,10 +14,6 @@ QtcPlugin { Depends { name: "QtcSsh" } cpp.defines: base.concat("QTC_CPU=X86Architecture") - cpp.includePaths: base.concat([ - customWizard.prefix, - publishing.prefix - ]) Properties { condition: qbs.targetOS.contains("osx") cpp.frameworks: base.concat(["Carbon"]) @@ -145,7 +141,6 @@ QtcPlugin { Group { name: "CustomWizard" - id: customWizard prefix: "customwizard/" files: [ "customwizard.cpp", "customwizard.h", @@ -237,7 +232,6 @@ QtcPlugin { Group { name: "Publishing" - id: publishing prefix: "publishing/" files: [ "ipublishingwizardfactory.h", diff --git a/src/plugins/projectexplorer/projectwelcomepage.cpp b/src/plugins/projectexplorer/projectwelcomepage.cpp index 3faa2c603c..c27d603ab4 100644 --- a/src/plugins/projectexplorer/projectwelcomepage.cpp +++ b/src/plugins/projectexplorer/projectwelcomepage.cpp @@ -40,7 +40,7 @@ #include <coreplugin/dialogs/iwizard.h> #include <projectexplorer/session.h> #include <projectexplorer/projectexplorer.h> -#include <sessiondialog.h> +#include <projectexplorer/sessiondialog.h> #ifdef Q_OS_WIN #include <utils/winutils.h> diff --git a/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui b/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui index c0284b6315..0533f059ec 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui +++ b/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui @@ -168,7 +168,7 @@ <customwidget> <class>QbsPropertyLineEdit</class> <extends>QLineEdit</extends> - <header>qbspropertylineedit.h</header> + <header location="global">qbsprojectmanager/qbspropertylineedit.h</header> </customwidget> </customwidgets> <resources/> diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs index 8e61109c0d..3f0adb21bb 100644 --- a/src/plugins/qmljstools/qmljstools.qbs +++ b/src/plugins/qmljstools/qmljstools.qbs @@ -17,8 +17,6 @@ QtcPlugin { Depends { name: "QmlDebug" } Depends { name: "QtSupport" } - cpp.includePaths: base.concat("../../libs/3rdparty") - files: [ "QmlJSTools.mimetypes.xml", "qmljsbundleprovider.cpp", diff --git a/src/plugins/qmlprofiler/canvas/canvas.pri b/src/plugins/qmlprofiler/canvas/canvas.pri index 8b5621fb44..2960e94527 100644 --- a/src/plugins/qmlprofiler/canvas/canvas.pri +++ b/src/plugins/qmlprofiler/canvas/canvas.pri @@ -1,5 +1,3 @@ -INCLUDEPATH += $$PWD - HEADERS += $$PWD/qdeclarativecontext2d_p.h \ $$PWD/qdeclarativecanvas_p.h \ $$PWD/qmlprofilercanvas.h \ diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs index 168c8d9013..82bf351cf8 100644 --- a/src/plugins/qmlprofiler/qmlprofiler.qbs +++ b/src/plugins/qmlprofiler/qmlprofiler.qbs @@ -19,8 +19,6 @@ QtcPlugin { Depends { name: "QmlJSTools" } Depends { name: "CPlusPlus" } - cpp.includePaths: base.concat(canvasGroup.prefix) - Group { name: "General" files: [ @@ -58,7 +56,6 @@ QtcPlugin { Group { name: "Canvas" - id: canvasGroup prefix: "canvas/" files: [ "qdeclarativecanvas.cpp", "qdeclarativecanvas_p.h", diff --git a/src/plugins/qnx/blackberryconfiguration.h b/src/plugins/qnx/blackberryconfiguration.h index 7e860be16d..115ec5d7ff 100644 --- a/src/plugins/qnx/blackberryconfiguration.h +++ b/src/plugins/qnx/blackberryconfiguration.h @@ -32,7 +32,7 @@ #ifndef BLACKBERRYCONFIGURATIONS_H #define BLACKBERRYCONFIGURATIONS_H -#include <qnxconstants.h> +#include "qnxconstants.h" #include <utils/environment.h> #include <utils/fileutils.h> diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs index c5c750d8d3..3106ba474c 100644 --- a/src/plugins/qnx/qnx.qbs +++ b/src/plugins/qnx/qnx.qbs @@ -17,8 +17,6 @@ QtcPlugin { Depends { name: "QmlDebug" } Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] } - cpp.includePaths: base.concat("../../shared") - files: [ "bardescriptordocument.cpp", "bardescriptordocument.h", diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui index 7f48f5e36a..568467950d 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui +++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui @@ -94,7 +94,7 @@ <customwidget> <class>Qt4ProjectManager::Internal::ClassList</class> <extends>QListWidget</extends> - <header>classlist.h</header> + <header location="global">qt4projectmanager/customwidgetwizard/classlist.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri index 488f9c30fb..0a48d5b4bd 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri +++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri @@ -1,4 +1,3 @@ -INCLUDEPATH *= $$PWD SOURCES += \ $$PWD/plugingenerator.cpp \ $$PWD/classlist.cpp \ diff --git a/src/plugins/qt4projectmanager/librarydetailswidget.ui b/src/plugins/qt4projectmanager/librarydetailswidget.ui index 70f0186c78..bc18a5e18c 100644 --- a/src/plugins/qt4projectmanager/librarydetailswidget.ui +++ b/src/plugins/qt4projectmanager/librarydetailswidget.ui @@ -244,7 +244,7 @@ <customwidget> <class>Qt4ProjectManager::Internal::LibraryPathChooser</class> <extends>QWidget</extends> - <header>addlibrarywizard.h</header> + <header location="global">qt4projectmanager/addlibrarywizard.h</header> <container>1</container> </customwidget> </customwidgets> diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h index 41044dba9c..1527a4b524 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h @@ -30,7 +30,7 @@ #ifndef QT4RUNCONFIGURATION_H #define QT4RUNCONFIGURATION_H -#include "qmakerunconfigurationfactory.h" +#include <qt4projectmanager/qmakerunconfigurationfactory.h> #include <projectexplorer/localapplicationrunconfiguration.h> diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qbs b/src/plugins/qt4projectmanager/qt4projectmanager.qbs index 25952b4be2..ecbdeb3a54 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager.qbs +++ b/src/plugins/qt4projectmanager/qt4projectmanager.qbs @@ -16,11 +16,6 @@ QtcPlugin { Depends { name: "TextEditor" } Depends { name: "QmlJSTools" } - cpp.includePaths: base.concat([ - customWidgetWizard.prefix, - "../../shared", - ]) - pluginRecommends: [ "Designer" ] @@ -66,7 +61,6 @@ QtcPlugin { Group { name: "Custom Widget Wizard" - id: customWidgetWizard prefix: "customwidgetwizard/" files: [ "classdefinition.cpp", "classdefinition.h", "classdefinition.ui", diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp index ac53c77a28..4fde9c23f7 100644 --- a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp @@ -32,7 +32,7 @@ #include "html5app.h" #include "html5appwizardpages.h" #include "targetsetuppage.h" -#include "qt4projectmanagerconstants.h" +#include <qt4projectmanager/qt4projectmanagerconstants.h> #include <qtsupport/baseqtversion.h> #include <projectexplorer/projectexplorerconstants.h> diff --git a/src/plugins/qt4projectmanager/wizards/modulespage.cpp b/src/plugins/qt4projectmanager/wizards/modulespage.cpp index 65a791dc58..5c772618bf 100644 --- a/src/plugins/qt4projectmanager/wizards/modulespage.cpp +++ b/src/plugins/qt4projectmanager/wizards/modulespage.cpp @@ -29,7 +29,7 @@ #include "modulespage.h" -#include "qtmodulesinfo.h" +#include <qt4projectmanager/qtmodulesinfo.h> #include <QDebug> diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp index 57c95752fb..db7a983da4 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp @@ -32,7 +32,7 @@ #include "qtquickapp.h" #include "qtquickappwizardpages.h" #include "targetsetuppage.h" -#include "qt4projectmanagerconstants.h" +#include <qt4projectmanager/qt4projectmanagerconstants.h> #include <qtsupport/qtsupportconstants.h> #include <qtsupport/baseqtversion.h> diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp index c6866fb51c..ab736d24b2 100644 --- a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp @@ -29,12 +29,13 @@ #include "qtwizard.h" -#include "qt4project.h" -#include "qt4projectmanager.h" -#include "qt4projectmanagerconstants.h" #include "modulespage.h" #include "targetsetuppage.h" +#include <qt4projectmanager/qt4project.h> +#include <qt4projectmanager/qt4projectmanager.h> +#include <qt4projectmanager/qt4projectmanagerconstants.h> + #include <coreplugin/icore.h> #include <cpptools/cpptoolsconstants.h> diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp index 60a8438f09..2e09450664 100644 --- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp +++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp @@ -31,10 +31,10 @@ #include "importwidget.h" #include "../qt4targetsetupwidget.h" -#include "buildconfigurationinfo.h" -#include "qt4buildconfiguration.h" -#include "qt4project.h" -#include "qmakekitinformation.h" +#include <qt4projectmanager/buildconfigurationinfo.h> +#include <qt4projectmanager/qt4buildconfiguration.h> +#include <qt4projectmanager/qt4project.h> +#include <qt4projectmanager/qmakekitinformation.h> #include <coreplugin/icore.h> #include <projectexplorer/projectexplorerconstants.h> diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs index 5af20a4fdf..e09ef1d726 100644 --- a/src/plugins/qtsupport/qtsupport.qbs +++ b/src/plugins/qtsupport/qtsupport.qbs @@ -14,7 +14,6 @@ QtcPlugin { cpp.includePaths: base.concat([ "../../shared", - "../../shared/proparser" ]) cpp.defines: base.concat([ diff --git a/src/plugins/resourceeditor/resourceeditor.pro b/src/plugins/resourceeditor/resourceeditor.pro index d10ddc591b..b71135955d 100644 --- a/src/plugins/resourceeditor/resourceeditor.pro +++ b/src/plugins/resourceeditor/resourceeditor.pro @@ -1,8 +1,6 @@ include(../../qtcreatorplugin.pri) include(qrceditor/qrceditor.pri) -INCLUDEPATH += $$PWD/../../tools/utils - HEADERS += resourceeditorfactory.h \ resourceeditorplugin.h \ resourcewizard.h \ diff --git a/src/plugins/resourceeditor/resourceeditor.qbs b/src/plugins/resourceeditor/resourceeditor.qbs index d433d883b1..479b4b6552 100644 --- a/src/plugins/resourceeditor/resourceeditor.qbs +++ b/src/plugins/resourceeditor/resourceeditor.qbs @@ -9,8 +9,6 @@ QtcPlugin { Depends { name: "Find" } Depends { name: "Qt"; submodules: ["widgets", "xml"] } - cpp.includePaths: base.concat(qrcEdtitor.prefix) - Group { name: "General" files: [ @@ -25,7 +23,6 @@ QtcPlugin { Group { name: "QRC Editor" - id: qrcEdtitor prefix: "qrceditor/" files: [ "qrceditor.cpp", "qrceditor.h", "qrceditor.ui", diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp index 652c2a7181..f81f7b2a82 100644 --- a/src/plugins/resourceeditor/resourceeditorw.cpp +++ b/src/plugins/resourceeditor/resourceeditorw.cpp @@ -31,7 +31,7 @@ #include "resourceeditorplugin.h" #include "resourceeditorconstants.h" -#include <qrceditor.h> +#include <resourceeditor/qrceditor/qrceditor.h> #include <aggregation/aggregate.h> #include <coreplugin/icore.h> diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index ea86ec3a20..a21959cdd6 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -42,14 +42,13 @@ #include "syntaxhighlighter.h" #include "indenter.h" #include "autocompleter.h" -#include "snippet.h" -#include "codeassistant.h" -#include "defaultassistinterface.h" #include "convenience.h" #include "texteditorsettings.h" #include "texteditoroverlay.h" #include "circularclipboard.h" #include "circularclipboardassist.h" +#include <texteditor/codeassist/codeassistant.h> +#include <texteditor/codeassist/defaultassistinterface.h> #include <aggregation/aggregate.h> #include <coreplugin/actionmanager/actionmanager.h> diff --git a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp index b6c479b9c8..bc0dff7041 100644 --- a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp +++ b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp @@ -29,8 +29,8 @@ #include "basicproposalitemlistmodel.h" #include "basicproposalitem.h" -#include "texteditorsettings.h" -#include "completionsettings.h" +#include <texteditor/texteditorsettings.h> +#include <texteditor/completionsettings.h> #include <QDebug> #include <QRegExp> diff --git a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp index 0540fb3de6..96fdc71b12 100644 --- a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp +++ b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp @@ -33,9 +33,9 @@ #include <texteditor/codeassist/genericproposal.h> #include <texteditor/codeassist/functionhintproposal.h> #include <texteditor/codeassist/basicproposalitemlistmodel.h> -#include "completionsettings.h" -#include "texteditorsettings.h" -#include "basetexteditor.h" +#include <texteditor/completionsettings.h> +#include <texteditor/texteditorsettings.h> +#include <texteditor/basetexteditor.h> using namespace TextEditor; diff --git a/src/plugins/texteditor/fontsettingspage.ui b/src/plugins/texteditor/fontsettingspage.ui index 4e27fc00a6..529deccde6 100644 --- a/src/plugins/texteditor/fontsettingspage.ui +++ b/src/plugins/texteditor/fontsettingspage.ui @@ -200,7 +200,7 @@ <customwidget> <class>TextEditor::Internal::ColorSchemeEdit</class> <extends>QWidget</extends> - <header>colorschemeedit.h</header> + <header location="global">texteditor/colorschemeedit.h</header> <container>1</container> </customwidget> </customwidgets> diff --git a/src/plugins/texteditor/generichighlighter/manager.cpp b/src/plugins/texteditor/generichighlighter/manager.cpp index 52b04074de..1a57836234 100644 --- a/src/plugins/texteditor/generichighlighter/manager.cpp +++ b/src/plugins/texteditor/generichighlighter/manager.cpp @@ -33,10 +33,10 @@ #include "highlighterexception.h" #include "definitiondownloader.h" #include "highlightersettings.h" -#include "plaintexteditorfactory.h" -#include "texteditorconstants.h" -#include "texteditorplugin.h" -#include "texteditorsettings.h" +#include <texteditor/plaintexteditorfactory.h> +#include <texteditor/texteditorconstants.h> +#include <texteditor/texteditorplugin.h> +#include <texteditor/texteditorsettings.h> #include <coreplugin/icore.h> #include <coreplugin/progressmanager/progressmanager.h> diff --git a/src/plugins/texteditor/plaintexteditor.cpp b/src/plugins/texteditor/plaintexteditor.cpp index 126da8a7cb..649b5f3bf6 100644 --- a/src/plugins/texteditor/plaintexteditor.cpp +++ b/src/plugins/texteditor/plaintexteditor.cpp @@ -32,13 +32,13 @@ #include "texteditorplugin.h" #include "texteditorsettings.h" #include "basetextdocument.h" -#include "highlightdefinition.h" -#include "highlighter.h" -#include "highlightersettings.h" -#include "manager.h" -#include "context.h" #include "normalindenter.h" #include "generichighlighter/highlighterutils.h" +#include <texteditor/generichighlighter/context.h> +#include <texteditor/generichighlighter/highlightdefinition.h> +#include <texteditor/generichighlighter/highlighter.h> +#include <texteditor/generichighlighter/highlightersettings.h> +#include <texteditor/generichighlighter/manager.h> #include <coreplugin/coreconstants.h> #include <coreplugin/icore.h> diff --git a/src/plugins/texteditor/snippets/snippet.cpp b/src/plugins/texteditor/snippets/snippet.cpp index 23c94fa6f1..45bf15fe95 100644 --- a/src/plugins/texteditor/snippets/snippet.cpp +++ b/src/plugins/texteditor/snippets/snippet.cpp @@ -273,7 +273,7 @@ Snippet::ParsedSnippet Snippet::parse(const QString &snippet) #ifdef WITH_TESTS # include <QTest> -# include "texteditorplugin.h" +# include "../texteditorplugin.h" void Internal::TextEditorPlugin::testSnippetParsing_data() { diff --git a/src/plugins/texteditor/texteditor.pro b/src/plugins/texteditor/texteditor.pro index 0d51c6e6a8..723dbda613 100644 --- a/src/plugins/texteditor/texteditor.pro +++ b/src/plugins/texteditor/texteditor.pro @@ -3,9 +3,6 @@ QT += xml network CONFIG += exceptions greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport include(../../qtcreatorplugin.pri) -INCLUDEPATH += generichighlighter \ - snippets \ - codeassist SOURCES += texteditorplugin.cpp \ textfilewizard.cpp \ plaintexteditor.cpp \ diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs index c954746fce..637b756fbc 100644 --- a/src/plugins/texteditor/texteditor.qbs +++ b/src/plugins/texteditor/texteditor.qbs @@ -10,13 +10,6 @@ QtcPlugin { Depends { name: "Find" } Depends { name: "Locator" } - cpp.includePaths: base.concat([ - "generichighlighter", - "snippets", - "codeassist", - "." - ]) - files: [ "autocompleter.cpp", "autocompleter.h", diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp index 5bd897625e..f1ab8582ac 100644 --- a/src/plugins/texteditor/texteditorplugin.cpp +++ b/src/plugins/texteditor/texteditorplugin.cpp @@ -38,10 +38,10 @@ #include "textfilewizard.h" #include "plaintexteditorfactory.h" #include "plaintexteditor.h" -#include "manager.h" #include "outlinefactory.h" #include "snippets/plaintextsnippetprovider.h" #include "basetextmarkregistry.h" +#include <texteditor/generichighlighter/manager.h> #include <coreplugin/icore.h> #include <coreplugin/variablemanager.h> diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp index cbdf323387..f083d8b2f1 100644 --- a/src/plugins/texteditor/texteditorsettings.cpp +++ b/src/plugins/texteditor/texteditorsettings.cpp @@ -40,10 +40,10 @@ #include "storagesettings.h" #include "tabsettings.h" #include "extraencodingsettings.h" -#include "highlightersettingspage.h" -#include "snippetssettingspage.h" #include "icodestylepreferences.h" #include "icodestylepreferencesfactory.h" +#include <texteditor/generichighlighter/highlightersettingspage.h> +#include <texteditor/snippets/snippetssettingspage.h> #include <extensionsystem/pluginmanager.h> #include <coreplugin/icore.h> diff --git a/src/plugins/updateinfo/updateinfo.qbs b/src/plugins/updateinfo/updateinfo.qbs index 0063247ce5..a2e15ec828 100644 --- a/src/plugins/updateinfo/updateinfo.qbs +++ b/src/plugins/updateinfo/updateinfo.qbs @@ -11,11 +11,6 @@ QtcPlugin { property bool enable: false pluginspecreplacements: ({"UPDATEINFO_EXPERIMENTAL_STR": (enable ? "false": "true")}) - cpp.includePaths: [ - "..", - buildDirectory, - ] - files: [ "updateinfobutton.cpp", "updateinfobutton.h", diff --git a/src/plugins/valgrind/callgrind/callgrind.pri b/src/plugins/valgrind/callgrind/callgrind.pri index 292f3a962f..2c93b7ee9d 100644 --- a/src/plugins/valgrind/callgrind/callgrind.pri +++ b/src/plugins/valgrind/callgrind/callgrind.pri @@ -1,7 +1,5 @@ QT *= network -INCLUDEPATH *= $$PWD - HEADERS += \ $$PWD/callgrindparser.h \ $$PWD/callgrindparsedata.h \ diff --git a/src/plugins/valgrind/memcheck/memcheck.pri b/src/plugins/valgrind/memcheck/memcheck.pri index facf1c4e11..b2d46a715f 100644 --- a/src/plugins/valgrind/memcheck/memcheck.pri +++ b/src/plugins/valgrind/memcheck/memcheck.pri @@ -1,7 +1,5 @@ QT *= network -INCLUDEPATH *= $$PWD - HEADERS += \ $$PWD/memcheckrunner.h diff --git a/src/plugins/valgrind/valgrind.pro b/src/plugins/valgrind/valgrind.pro index 4ebf133ff1..188ac67ec7 100644 --- a/src/plugins/valgrind/valgrind.pro +++ b/src/plugins/valgrind/valgrind.pro @@ -6,8 +6,6 @@ QT *= network CONFIG += exceptions -INCLUDEPATH *= $$PWD - HEADERS += \ valgrindplugin.h \ valgrindengine.h \ diff --git a/src/plugins/valgrind/xmlprotocol/xmlprotocol.pri b/src/plugins/valgrind/xmlprotocol/xmlprotocol.pri index fe3fda438f..d9e4262d2c 100644 --- a/src/plugins/valgrind/xmlprotocol/xmlprotocol.pri +++ b/src/plugins/valgrind/xmlprotocol/xmlprotocol.pri @@ -1,7 +1,5 @@ QT *= network -INCLUDEPATH *= $$PWD - HEADERS += \ $$PWD/frame.h \ $$PWD/parser.h \ diff --git a/src/plugins/welcome/welcome.qbs b/src/plugins/welcome/welcome.qbs index 2db71cde5d..20b0400f54 100644 --- a/src/plugins/welcome/welcome.qbs +++ b/src/plugins/welcome/welcome.qbs @@ -9,8 +9,6 @@ QtcPlugin { Depends { name: "Core" } Depends { name: "ProjectExplorer" } - cpp.includePaths: base.concat("../../shared/scriptwrapper") - files: [ "welcomeplugin.cpp", "welcomeplugin.h", diff --git a/src/tools/qtcdebugger/main.cpp b/src/tools/qtcdebugger/main.cpp index 23ea477ba5..5123ce9fb3 100644 --- a/src/tools/qtcdebugger/main.cpp +++ b/src/tools/qtcdebugger/main.cpp @@ -45,7 +45,7 @@ #include <QProcess> #include <QPushButton> -#include "registryaccess.h" +#include <registryaccess.h> #include <windows.h> #include <psapi.h> diff --git a/src/tools/qtcdebugger/qtcdebugger.qbs b/src/tools/qtcdebugger/qtcdebugger.qbs index 46990a36b6..284ad71118 100644 --- a/src/tools/qtcdebugger/qtcdebugger.qbs +++ b/src/tools/qtcdebugger/qtcdebugger.qbs @@ -5,10 +5,7 @@ QtcTool { name: "qtcdebugger" condition: qbs.targetOS.contains("windows") - cpp.includePaths: [ - buildDirectory, - "../../shared/registryaccess" - ] + cpp.includePaths: base.concat(["../../shared/registryaccess"]) cpp.dynamicLibraries: [ "psapi", "advapi32" diff --git a/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs b/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs index 47dad6e810..4b5a4910cc 100644 --- a/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs +++ b/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs @@ -5,11 +5,7 @@ QtcTool { name: "qtcreator_crash_handler" condition: qbs.targetOS.contains("linux") && qbs.buildVariant == "debug" - cpp.includePaths: [ - buildDirectory, - "../../libs" - ] - + Depends { name: "Utils" } Depends { name: "Qt.widgets" } Depends { name: "app_version_header" } @@ -23,13 +19,4 @@ QtcTool { "utils.cpp", "utils.h" ] } - - Group { - name: "Utils Sources" - prefix: "../../libs/utils/" - files: [ - "checkablemessagebox.cpp", "checkablemessagebox.h", - "environment.cpp", "environment.h" - ] - } } diff --git a/src/tools/sdktool/sdktool.qbs b/src/tools/sdktool/sdktool.qbs index e9510a4ee8..a8ea1aae1f 100644 --- a/src/tools/sdktool/sdktool.qbs +++ b/src/tools/sdktool/sdktool.qbs @@ -8,7 +8,6 @@ QtcTool { Depends { name: "Utils" } Depends { name: "app_version_header" } - cpp.includePaths: "../../libs" cpp.defines: base.concat([qbs.targetOS.contains("osx") ? 'DATA_PATH="."' : 'DATA_PATH="../share/qtcreator"']) |