diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-09-28 13:42:01 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-10-04 07:58:31 +0000 |
| commit | 9ecb100128ee8729c4ad50e2ae5981c10ba6c286 (patch) | |
| tree | 789f8409887999e6f38fe1cdad27ec610e85033c /optional/projectexplorer | |
| parent | 3412dc563119221bd730c1487937519df0761792 (diff) | |
Include Qt Creator typesystem instead of duplicating API4.8
This seems to work now after beautifying the import hierarchy.
Change-Id: I24daf09ff63ef91023366c12308d2f9fcd2676aa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'optional/projectexplorer')
4 files changed, 2 insertions, 12 deletions
diff --git a/optional/projectexplorer/bindingheaders/utils.h b/optional/projectexplorer/bindingheaders/utils.h deleted file mode 100644 index e69de29..0000000 --- a/optional/projectexplorer/bindingheaders/utils.h +++ /dev/null diff --git a/optional/projectexplorer/bindingheaders/utils_filename.h b/optional/projectexplorer/bindingheaders/utils_filename.h deleted file mode 100644 index e69de29..0000000 --- a/optional/projectexplorer/bindingheaders/utils_filename.h +++ /dev/null diff --git a/optional/projectexplorer/projectexplorer.pro b/optional/projectexplorer/projectexplorer.pro index b998d93..88bf4a1 100644 --- a/optional/projectexplorer/projectexplorer.pro +++ b/optional/projectexplorer/projectexplorer.pro @@ -18,6 +18,7 @@ QTC_PLUGIN_RECOMMENDS += \ include(../binding/binding.pri) INCLUDEPATH *= $$IDE_SOURCE_TREE/src/plugins/projectexplorer + win32: DEFINES += NOMINMAX # Shiboken binding generation setup @@ -40,8 +41,6 @@ WRAPPED_CLASSES = \ bindingheaders/projectexplorer_runconfiguration.h \ bindingheaders/projectexplorer_project.h \ bindingheaders/projectexplorer_projecttree.h \ - bindingheaders/utils.h \ - bindingheaders/utils_filename.h \ # Sentinel line include(../../shiboken.pri) diff --git a/optional/projectexplorer/typesystem_projectexplorer.xml b/optional/projectexplorer/typesystem_projectexplorer.xml index 0e0eeff..ab66793 100644 --- a/optional/projectexplorer/typesystem_projectexplorer.xml +++ b/optional/projectexplorer/typesystem_projectexplorer.xml @@ -42,11 +42,8 @@ <!-- Typesystem for Qt Creator Python host plugin --> <typesystem package="QtCreatorBindingProjectExplorer"> - - <!-- Load PySide QtWidgets typesystem (is this correct? yup) --> <load-typesystem name="typesystem_widgets.xml" generate="no"/> - <!-- Currently there are problems with getting this to work ... --> - <!-- <load-typesystem name="../../plugins/pythonextensions/typesystem_qtcreator.xml" generate="no"/> --> + <load-typesystem name="../../plugins/pythonextensions/typesystem_qtcreator.xml" generate="no"/> <namespace-type name="ProjectExplorer"> <object-type name="BuildConfiguration"> @@ -65,10 +62,4 @@ <modify-function signature="fromMap(const QVariantMap&,QString*)" remove="all"/> </object-type> </namespace-type> - - <namespace-type name="Utils"> - <value-type name="FileName"/> - <modify-function signature="operator<<(QTextStream&,Utils::FileName)" remove="all"/> - </namespace-type> - </typesystem> |