From 5aef9c69d3ea78c950f89eff656ea59cffc33bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Devernay?= Date: Mon, 23 May 2016 15:47:15 +0200 Subject: [PATCH] pyside config goes to config.pri --- INSTALL_LINUX.md | 4 ++++ global.pri | 6 ------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/INSTALL_LINUX.md b/INSTALL_LINUX.md index 57890a30e4..fad1781240 100644 --- a/INSTALL_LINUX.md +++ b/INSTALL_LINUX.md @@ -129,6 +129,10 @@ LIBS is the path to the libs expat: LIBS += -lexpat expat: PKGCONFIG -= expat cairo: PKGCONFIG -= cairo + PYSIDE_PKG_CONFIG_PATH = $$system($$PYTHON_CONFIG --prefix)/lib/pkgconfig + pyside: PKGCONFIG += pyside + pyside: INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH pkg-config --variable=includedir pyside)/QtCore + pyside: INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH pkg-config --variable=includedir pyside)/QtGui EOF ----- end ----- diff --git a/global.pri b/global.pri index 8b6fd35d26..8102021bd5 100644 --- a/global.pri +++ b/global.pri @@ -319,12 +319,6 @@ unix { LIBS += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH pkg-config --libs pyside) } } - !macx { - PYSIDE_PKG_CONFIG_PATH = $$system($$PYTHON_CONFIG --prefix)/lib/pkgconfig - pyside: PKGCONFIG += pyside-py2 - pyside: INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH pkg-config --variable=includedir pyside-py2)/QtCore - pyside: INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH pkg-config --variable=includedir pyside-py2)/QtGui - } } #unix *-xcode {