[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pykde
Subject:    [PyQt] Patch: PyQt 4.10.3 support for OS X 10.9 and Qt 4.8.6
From:       Brian Jensen <jensen.j.brian () gmail ! com>
Date:       2013-12-16 12:28:41
Message-ID: BF2F7A04-1CF5-4C2A-8835-F72D337D7462 () gmail ! com
[Download RAW message or body]

Hi,

the upcoming Qt 4.8.6 release introduces a new qmake configuration =
mkspec that is necessary for supporting OS X 10.9 with libc++. The old =
build configuration method, configure.py, does not properly handle Qt =
qmake configurations that live under =93mkspecs/unsupported=94, and it =
also does not handle qmake variable definitions that have inline =
comments. I have attached a patch that fixes both of these issues. I =
know that the new method, configure-ng.py, is recommended but many of =
the software packages I depend on still require the pyqtconfig.py for =
building.

Cheers,
Brian


["configure.py.diff" (configure.py.diff)]

diff --git a/configure.py b/configure.py
index a5f1474..795c7ca 100644
--- a/configure.py
+++ b/configure.py
@@ -1886,7 +1886,7 @@ def get_build_macros(overrides):
     if "QMAKESPEC" in list(os.environ.keys()):
         fname = os.environ["QMAKESPEC"]
 
-        if not os.path.dirname(fname):
+        if not os.path.dirname(fname) or fname.startswith('unsupported'):
             qt_macx_spec = fname
             fname = os.path.join(qt_archdatadir, "mkspecs", fname)
     elif sys.platform == "darwin":
@@ -1934,6 +1934,11 @@ def get_build_macros(overrides):
     if macros is None:
         return None
 
+    # QMake macros may contain comments on the same line so we need to remove them
+    for macro, value in macros.iteritems():
+        if "#" in value:
+            macros[macro] = value.split("#", 1)[0]
+
     # Qt5 doesn't seem to support the specific macros so add them if they are
     # missing.
     if macros.get("INCDIR_QT", "") == "":




_______________________________________________
PyQt mailing list    PyQt@riverbankcomputing.com
http://www.riverbankcomputing.com/mailman/listinfo/pyqt

[prev in list] [next in list] [prev in thread] [next in thread]