diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-08-22 13:38:20 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-08-23 09:21:22 +0000 |
| commit | 50acbb720c82bccc46ec827f3cec276a634c6b46 (patch) | |
| tree | 1ed86ae903b191022878c46a4fd6b0d975fb42f8 | |
| parent | 220a6c5c759278fcf9b80a1ce3f90608d1f407a9 (diff) | |
Further Windows fixes
- Disambiguate coreplugin, utils/fileutils.h
- Link dl only on Unix
Change-Id: Iace80e49a9ee878dab762f167d016e78ba0c76f1
Reviewed-by: hjk <hjk@qt.io>
| -rw-r--r-- | plugins/pythonextensions/pyside2.pri | 7 | ||||
| -rw-r--r-- | plugins/pythonextensions/typesystem_qtcreator.xml | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/plugins/pythonextensions/pyside2.pri b/plugins/pythonextensions/pyside2.pri index 62acd30..4c8b400 100644 --- a/plugins/pythonextensions/pyside2.pri +++ b/plugins/pythonextensions/pyside2.pri @@ -30,12 +30,11 @@ LIBS += $$PYTHON_LFLAGS $$PYSIDE2_LFLAGS !win32 { QMAKE_RPATHDIR += $$PYSIDE2 + # Needed to fix Python dynamic linking problems + # see pyutil.cpp + LIBS += -ldl } -# Needed to fix Python dynamic linking problems -# see pyutil.cpp -LIBS += -ldl - # Suppress non-relevant warnings from # Shiboken generated code *g++* { diff --git a/plugins/pythonextensions/typesystem_qtcreator.xml b/plugins/pythonextensions/typesystem_qtcreator.xml index 9a1376d..736fe44 100644 --- a/plugins/pythonextensions/typesystem_qtcreator.xml +++ b/plugins/pythonextensions/typesystem_qtcreator.xml @@ -86,7 +86,10 @@ <!-- <object-type name="EditorManagerPlaceHolder"/> --> <!-- <object-type name="EditorToolBar"/> --> <!-- <object-type name="ExternalToolManager"/> --> - <object-type name="FileUtils"/> + <object-type name="FileUtils"> + <!-- Disambiguate from utils/fileutils --> + <include file-name="coreplugin/fileutils.h" location="global"/> + </object-type> <!-- <object-type name="Find"/> --> <!-- <object-type name="FindToolBarPlaceHolder"/> --> <!-- <object-type name="FutureProgress"/> --> |