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 /shiboken.pri | |
| 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 'shiboken.pri')
| -rw-r--r-- | shiboken.pri | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shiboken.pri b/shiboken.pri index 29e81b9..587406a 100644 --- a/shiboken.pri +++ b/shiboken.pri @@ -24,7 +24,7 @@ for (path, SHIBOKEN_FRAMEWORKPATHS): SHIBOKEN_CXXFLAGS *= -F$$path SHIBOKEN_OPTIONS = --generator-set=shiboken --enable-parent-ctor-heuristic \ --enable-pyside-extensions --enable-return-value-heuristic --use-isnull-as-nb_nonzero \ - $$SHIBOKEN_CXXFLAGS -I$$PWD -T$$PWD -T$$PYSIDE2/typesystems --output-directory=$$OUT_PWD + $$SHIBOKEN_CXXFLAGS -T$$PYSIDE2/typesystems --output-directory=$$OUT_PWD win32: SHIBOKEN_OPTIONS += --avoid-protected-hack @@ -50,8 +50,8 @@ QMAKE_EXTRA_COMPILERS += shiboken module_wrapper_dummy_command # TODO: Fix some more of these hardcoded include paths INCLUDEPATH += $$WRAPPER_DIR \ - $$WRAPPER_DIR/../../../plugins/pythonextensions \ - $$WRAPPER_DIR/../../../plugins/pythonextensions/PythonExtension/QtCreator \ + $$PWD/plugins/pythonextensions \ + $$shadowed($$PWD)/plugins/pythonextensions/QtCreator \ "$$IDE_SOURCE_TREE/src/plugins/coreplugin" \ "$$IDE_SOURCE_TREE/src/plugins/coreplugin/actionmanager" \ "$$IDE_SOURCE_TREE/src/plugins/coreplugin/editormanager" \ |