pyside config goes to config.pri

MX-05 · May 23, 2016 · 5aef9c6 · 5aef9c6
1 parent 5cca014
commit 5aef9c6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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 {