Merge remote-tracking branch 'origin/4.10'

Conflicts: src/plugins/python/CMakeLists.txt Change-Id: I18808710dd99b97d4e1e7c3d223b7f814083de31
2019-08-12 17:04:12 +02:00
parent a90b1c26b1 821f799ff3
commit 21c2bf7e72
29 changed files with 99 additions and 40 deletions
--- a/src/plugins/python/CMakeLists.txt
+++ b/src/plugins/python/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_plugin(Python
-  PLUGIN_DEPENDS Core QtSupport ProjectExplorer TextEditor
+  PLUGIN_DEPENDS Core ProjectExplorer TextEditor
  SOURCES
    python.qrc
    pythoneditor.cpp pythoneditor.h
--- a/src/plugins/python/python.qbs
+++ b/src/plugins/python/python.qbs
@@ -8,7 +8,6 @@ QtcPlugin {

    Depends { name: "Core" }
    Depends { name: "TextEditor" }
-    Depends { name: "QtSupport" }
    Depends { name: "ProjectExplorer" }

    Group {
--- a/src/plugins/python/python_dependencies.pri
+++ b/src/plugins/python/python_dependencies.pri
@@ -5,5 +5,4 @@ QTC_LIB_DEPENDS += \
 QTC_PLUGIN_DEPENDS += \
    coreplugin \
    texteditor \
-    qtsupport \
    projectexplorer