diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-09-05 14:09:05 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-09-10 11:10:48 +0000 |
| commit | 1526c8fbf9f62391c4ff03fbff458f53f3e91a06 (patch) | |
| tree | b685bc1b2deecbeecc3adf97c61504fa91b24e61 | |
| parent | 50acbb720c82bccc46ec827f3cec276a634c6b46 (diff) | |
Get Qt compile flags for shiboken more generically
Get the include and framework paths from the Qt modules directly.
This automatically takes care of differences between macOS and Win/Lin
then.
Change-Id: I5e43641e01c43485828939547ac33b9acadbbae9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | plugins/pythonextensions/pythonextensions.pro | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/plugins/pythonextensions/pythonextensions.pro b/plugins/pythonextensions/pythonextensions.pro index eb24db6..1324187 100644 --- a/plugins/pythonextensions/pythonextensions.pro +++ b/plugins/pythonextensions/pythonextensions.pro @@ -34,16 +34,21 @@ TYPESYSTEM_FILE = typesystem_qtcreator.xml include(pyside2.pri) -## Include Qt and QtCreator paths -QT_INCLUDEPATHS = -I"$$[QT_INSTALL_HEADERS]" -I"$$[QT_INSTALL_HEADERS]/QtCore" \ - -I"$$[QT_INSTALL_HEADERS]/QtGui" -I"$$[QT_INSTALL_HEADERS]/QtWidgets" \ - -I"$$IDE_SOURCE_TREE/src/plugins" \ - -I"$$IDE_SOURCE_TREE/src/plugins/coreplugin" \ - -I"$$IDE_SOURCE_TREE/src/libs" +# Qt include paths +SHIBOKEN_QT = core gui widgets +for (qt, SHIBOKEN_QT) { + SHIBOKEN_INCLUDEPATHS *= $$eval(QT.$${qt}.includes) + SHIBOKEN_FRAMEWORKPATHS *= $$eval(QT.$${qt}.frameworks) +} + +# Qt Creator include paths +SHIBOKEN_INCLUDEPATHS *= $$INCLUDEPATH +for (path, SHIBOKEN_INCLUDEPATHS): SHIBOKEN_CXXFLAGS *= -I$$path +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 \ - $$QT_INCLUDEPATHS -I$$PWD -T$$PWD -T$$PYSIDE2/typesystems --output-directory=$$OUT_PWD + $$SHIBOKEN_CXXFLAGS -I$$PWD -T$$PWD -T$$PYSIDE2/typesystems --output-directory=$$OUT_PWD win32: SHIBOKEN_OPTIONS += --avoid-protected-hack |