From: Stefan Bund <stefan@j32.de>
Date: Mon, 18 Oct 2010 09:23:19 +0000 (+0200)
Subject: Remove pkg-config support (allows working with self-compiled Qt libs)
X-Git-Url: http://g0dil.de/git?p=qtscons.git;a=commitdiff_plain;h=e0f81fd5672009189499c7f766980a7f8b16bd6c

Remove pkg-config support (allows working with self-compiled Qt libs)
---

diff --git a/qt4.py b/qt4.py
index bd60ba1..d2cef9d 100644
--- a/qt4.py
+++ b/qt4.py
@@ -470,19 +470,14 @@ def enable_modules(self, modules, debug=False, crosscompiling=False) :
     if sys.platform in ["darwin", "linux2"] and not crosscompiling :
         if debug : debugSuffix = '_debug'
         for module in modules :
-            if module not in pclessModules : continue
             self.AppendUnique(LIBS=[module+debugSuffix])
             self.AppendUnique(LIBPATH=[os.path.join("$QTDIR","lib")])
             self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt4")])
             self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt4",module)])
-        pcmodules = [module+debugSuffix for module in modules if module not in pclessModules ]
-        if 'QtDBus' in pcmodules:
+        if 'QtDBus' in modules:
             self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt4","QtDBus")])
-        if "QtAssistant" in pcmodules:
+        if "QtAssistant" in modules:
             self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt4","QtAssistant")])
-            pcmodules.remove("QtAssistant")
-            pcmodules.append("QtAssistantClient")
-        self.ParseConfig('pkg-config %s --libs --cflags'% ' '.join(pcmodules))
         self["QT4_MOCCPPPATH"] = self["CPPPATH"]
         return
     if sys.platform == "win32" or crosscompiling :