author: Brian Nelson <email address hidden>
Ensure the Qt4 version of moc is launched.
--- a/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp +++ b/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp @@ -391,7 +391,7 @@ 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("/moc-qt4"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text);
if (!proc.waitForStarted()) { fprintf(stderr, PROGRAMNAME ": could not execute moc! Aborting.\n");
author: Brian Nelson <email address hidden>
Ensure the Qt4 version of moc is launched.
--- a/tools/ qdbus/tools/ qdbuscpp2xml/ qdbuscpp2xml. cpp qdbus/tools/ qdbuscpp2xml/ qdbuscpp2xml. cpp
QProcess proc; QLibraryInfo: :location( QLibraryInfo: :BinariesPath) + QLatin1String( "/moc") , QStringList() << QFile:: decodeName( argv[i] ), QIODevice::ReadOnly | QIODevice::Text); QLibraryInfo: :location( QLibraryInfo: :BinariesPath) + QLatin1String( "/moc-qt4" ), QStringList() << QFile:: decodeName( argv[i] ), QIODevice::ReadOnly | QIODevice::Text);
+++ b/tools/
@@ -391,7 +391,7 @@
else {
// run moc on this file
- proc.start(
+ proc.start(
if (!proc. waitForStarted( )) {
fprintf( stderr, PROGRAMNAME ": could not execute moc! Aborting.\n");