diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-08-12 17:04:12 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-08-12 17:04:12 +0200 |
| commit | 21c2bf7e72b6c48ac2ce013001f5bbdc118b1375 (patch) | |
| tree | 01c9a4ffb658c2cf3fac721508ddc809cfb8aae6 /src/plugins/python | |
| parent | a90b1c26b1d9f7b76dad51e5ec5f2c15f8816ad6 (diff) | |
| parent | 821f799ff3d017e9cdc8bfe3c96fed1982de8753 (diff) | |
| download | qt-creator-21c2bf7e72b6c48ac2ce013001f5bbdc118b1375.tar.gz | |
Merge remote-tracking branch 'origin/4.10'
Conflicts:
src/plugins/python/CMakeLists.txt
Change-Id: I18808710dd99b97d4e1e7c3d223b7f814083de31
Diffstat (limited to 'src/plugins/python')
| -rw-r--r-- | src/plugins/python/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/python/python.qbs | 1 | ||||
| -rw-r--r-- | src/plugins/python/python_dependencies.pri | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/python/CMakeLists.txt b/src/plugins/python/CMakeLists.txt index 7dd1f2fab5..196188f01e 100644 --- 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 diff --git a/src/plugins/python/python.qbs b/src/plugins/python/python.qbs index f45d4a0fb7..56a5820528 100644 --- 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 { diff --git a/src/plugins/python/python_dependencies.pri b/src/plugins/python/python_dependencies.pri index 8ca62c74e7..5f2a87c283 100644 --- 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 |