Blame 0028-AutoMoc-lazyInit-expects-the-app-to-get-6-parameter-.patch
|
Rex Dieter |
29094f |
From 0fc7d228b97654c4422c4d3a2534f6af43c4a530 Mon Sep 17 00:00:00 2001
|
|
Rex Dieter |
29094f |
From: Michael Jansen <kde@michael-jansen.biz>
|
|
Rex Dieter |
29094f |
Date: Wed, 16 Feb 2011 23:48:53 +0100
|
|
Rex Dieter |
29094f |
Subject: [PATCH 28/33] AutoMoc::lazyInit() expects the app to get 6 parameter
|
|
Rex Dieter |
29094f |
but run() only checks for 5.
|
|
Rex Dieter |
29094f |
|
|
Rex Dieter |
29094f |
Fix that so i do not get a qt assertion here.
|
|
Rex Dieter |
29094f |
---
|
|
Rex Dieter |
29094f |
kde4automoc.cpp | 3 ++-
|
|
Rex Dieter |
29094f |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
Rex Dieter |
29094f |
|
|
Rex Dieter |
29094f |
diff --git a/kde4automoc.cpp b/kde4automoc.cpp
|
|
Rex Dieter |
29094f |
index d5a00d7..2e219f3 100644
|
|
Rex Dieter |
29094f |
--- a/kde4automoc.cpp
|
|
Rex Dieter |
29094f |
+++ b/kde4automoc.cpp
|
|
Rex Dieter |
29094f |
@@ -164,6 +164,7 @@ void AutoMoc::lazyInitMocDefinitions()
|
|
Rex Dieter |
29094f |
void AutoMoc::lazyInit()
|
|
Rex Dieter |
29094f |
{
|
|
Rex Dieter |
29094f |
const QStringList &args = QCoreApplication::arguments();
|
|
Rex Dieter |
29094f |
+
|
|
Rex Dieter |
29094f |
mocExe = args[4];
|
|
Rex Dieter |
29094f |
cmakeExecutable = args[5];
|
|
Rex Dieter |
29094f |
|
|
Rex Dieter |
29094f |
@@ -246,7 +247,7 @@ bool AutoMoc::run()
|
|
Rex Dieter |
29094f |
::exit(EXIT_FAILURE);
|
|
Rex Dieter |
29094f |
}
|
|
Rex Dieter |
29094f |
}
|
|
Rex Dieter |
29094f |
- else if (args.size() < 5) {
|
|
Rex Dieter |
29094f |
+ else if (args.size() < 6) {
|
|
Rex Dieter |
29094f |
printUsage(args[0]);
|
|
Rex Dieter |
29094f |
::exit(EXIT_FAILURE);
|
|
Rex Dieter |
29094f |
}
|
|
Rex Dieter |
29094f |
--
|
|
Rex Dieter |
29094f |
2.4.3
|
|
Rex Dieter |
29094f |
|