Ticket #47204: patch-build-system-for-MacPorts.diff

generator/generator.pri

@@ -5 +5 @@
 TARGET = generator
 DEPENDPATH += $$GENERATORPATH tests parser
 mac:CONFIG -= app_bundle
+
+LIBS *= -L/opt/local/lib
+INCLUDEPATH += /opt/local/include/qt4
+INCLUDEPATH += /opt/local/include/phonon
+INCLUDEPATH += /opt/local/include
+
 INCLUDEPATH += $$GENERATORPATH/.
 INCLUDEPATH += $$GENERATORPATH/../common
 

generator/main.h

@@ -46 +46 @@
 
 #include <QFile>
 #include <QDir>
+#include <QDebug>
 
 struct Preprocess
 {
@@ -87 +88 @@
             includes += commandLineIncludes.split(path_splitter);        
 
         // Include Qt
+        qDebug() << "includes=" << includes;
         QString qtdir = getenv ("QTDIR");
         if (qtdir.isEmpty()) {
 #if defined(Q_OS_MAC)
             qWarning("QTDIR environment variable not set. Assuming standard binary install using frameworks.");
-            QString frameworkDir = "/Library/Frameworks";
+            QString frameworkDir = getenv("QTFRAMEWORKS");
+            if (frameworkDir.isEmpty()) {
+                frameworkDir = "@QT_FRAMEWORKS_DIR@";
+            }
             includes << (frameworkDir + "/QtXml.framework/Headers");
             includes << (frameworkDir + "/QtNetwork.framework/Headers");
             includes << (frameworkDir + "/QtCore.framework/Headers");
             includes << (frameworkDir + "/QtGui.framework/Headers");
             includes << (frameworkDir + "/QtOpenGL.framework/Headers");
             includes << frameworkDir;
+            includes << "@QT_INCLUDES_DIR@";
+            includes << "@PREFIX@/include/phonon";
+            includes << "@PREFIX@/include";
 #else
             qWarning("QTDIR environment variable not set. This may cause problems with finding the necessary include files.");
 #endif
@@ -110 +118 @@
             includes << (qtdir + "/QtOpenGL");
             includes << qtdir;
         }
+        qDebug() << "includes=" << includes;
 
         foreach (QString include, includes)
             preprocess.push_include_path(QDir::convertSeparators(include).toStdString());        

qtbindings/qtbindingsbase.pri

@@ -1 +1 @@
 TEMPLATE = lib
 DEPENDPATH += .
 INCLUDEPATH += .
+INCLUDEPATH += /opt/local/include/qt4
+INCLUDEPATH += /opt/local/include/phonon
+INCLUDEPATH += /opt/local/include
 DESTDIR = $$PWD/../plugins/script
 QT += script
 CONFIG += @ARCHES@ @BUILD_TYPE@
 GENERATEDCPP = $$PWD/../generated_cpp
 TARGET=$$qtLibraryTarget($$TARGET)
 target.path = $$[QT_INSTALL_PLUGINS]/script