5748aeeec9
while there, clean up wantlibs. - fix bug with new phonon (pick up ours and not it) - fix a bug in qdbuscpp2xml (timeout) - more patches for gcc3: sse code ICES, new demo doesn't compile. spectrum not installed, seems to be macosX or something ? I can't get a thing out of it. Tested on gcc4 and gcc3...
22 lines
1.3 KiB
Plaintext
22 lines
1.3 KiB
Plaintext
$OpenBSD: patch-tools_qdbus_qdbuscpp2xml_qdbuscpp2xml_cpp,v 1.3 2010/06/21 16:40:52 espie Exp $
|
|
--- tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp.orig Thu Feb 11 16:55:15 2010
|
|
+++ tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp Fri Jun 18 18:56:27 2010
|
|
@@ -396,7 +396,7 @@ int main(int argc, char **argv)
|
|
else {
|
|
// run moc on this file
|
|
QProcess proc;
|
|
- proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text);
|
|
+ proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc4"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text);
|
|
|
|
if (!proc.waitForStarted()) {
|
|
fprintf(stderr, PROGRAMNAME ": could not execute moc! Aborting.\n");
|
|
@@ -405,7 +405,7 @@ int main(int argc, char **argv)
|
|
|
|
proc.closeWriteChannel();
|
|
|
|
- if (!proc.waitForFinished() || proc.exitStatus() != QProcess::NormalExit ||
|
|
+ if (!proc.waitForFinished(-1) || proc.exitStatus() != QProcess::NormalExit ||
|
|
proc.exitCode() != 0) {
|
|
// output the moc errors:
|
|
fprintf(stderr, "%s", proc.readAllStandardError().constData());
|