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

List:       kde-commits
Subject:    kdesupport/cpptoxml
From:       Peter Kümmel <syntheticpp () yahoo ! com>
Date:       2009-03-06 22:30:30
Message-ID: 1236378630.677617.5590.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 936079 by kuemmel:

sync with lqt master git

 M  +28 -9     main.cpp  


--- trunk/kdesupport/cpptoxml/main.cpp #936078:936079
@@ -477,13 +477,21 @@
 		return 1;
 	}
 	
+	QString frameworkDir = "/Library/Frameworks";
 	if (!QFileInfo(sourceName).exists()) {
 		QString qtincludefile = QDir::fromNativeSeparators(qtdir+'/'+sourceName+'/'+sourceName);
+		QString macincludefile = QString("%1/%2.framework/Headers/%2").arg(frameworkDir).arg(sourceName);
 		if (QFileInfo(qtincludefile).exists()) {
 			sourceName = qtincludefile;
+		} else if (QFileInfo(macincludefile).exists()) {
+			sourceName = macincludefile;
 		} else {
 			QString msg = "Error: wether '" + sourceName + "' nor '" + qtincludefile + "' found";
-			fprintf(stderr, "%s\n", msg.toLatin1().constData());
+#if defined(Q_OS_MAC)
+			msg += "' or '" + macincludefile;
+#endif
+            msg += "' found";
+			fprintf(stderr, msg.toLatin1().constData());
 			return 1;
 		}
 	}
@@ -493,19 +501,30 @@
 	QString currentDir = QDir::current().absolutePath();
 	QFileInfo sourceInfo(sourceName);
 	//QDir::setCurrent(sourceInfo.absolutePath());
-	
+
 	inclist << (sourceInfo.absolutePath());
 	inclist << (QDir::convertSeparators(qtdir));
-	inclist << (QDir::convertSeparators(qtdir + "/QtXml"));
-	inclist << (QDir::convertSeparators(qtdir + "/QtNetwork"));
-	inclist << (QDir::convertSeparators(qtdir + "/QtCore"));
-	inclist << (QDir::convertSeparators(qtdir + "/QtGui"));
-	inclist << (QDir::convertSeparators(qtdir + "/QtOpenGL"));
-	if(debug) qDebug() << inclist;
+
+	QStringList qts;
+	qts << "QtXml" << "QtNetwork" << "QtCore" << "QtGui"
+		<<"QtOpenGL" << "QtWebKit"<< "QtScript" << "QtSvg";
+
+	Q_FOREACH(const QString& lib, qts) {
+		if (sourceName.contains(frameworkDir)) {
+			// TODO does not work with framework because there are no QtCore, QtGui, ... folders
+			inclist << QString("%1/%2.framework/Headers").arg(frameworkDir).arg(lib);
+		} else {
+			inclist << QDir::convertSeparators(qtdir + "/" + lib);
+		}
+	}
+
+	if(debug) qDebug() << "atdir: " << qtdir << "sourceName: " << sourceName << inclist;
 	
+	
 	Preprocessor pp;
 	pp.addIncludePaths(inclist);
-	pp.processFile(sourceName, configName);
+	pp.processFile(configName);
+	pp.processFile(sourceName);
 	QByteArray contents = pp.result();
 	
 	if(debug) qDebug() << pp.macroNames();
[prev in list] [next in list] [prev in thread] [next in thread]