From 6a4518b3c8f5c90f5d1ec79cded939c8d6cb506b Mon Sep 17 00:00:00 2001 From: Matthias Kretz Date: Tue, 6 Nov 2007 15:53:19 +0000 Subject: - GPLv2+ - found an uncommitted change that omits -I if path.isEmpty() which can happen if no include paths are given svn path=/trunk/KDE/kdelibs/; revision=733538 --- automoc/kde4automoc.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'automoc/kde4automoc.cpp') diff --git a/automoc/kde4automoc.cpp b/automoc/kde4automoc.cpp index bb356037..b21b6364 100644 --- a/automoc/kde4automoc.cpp +++ b/automoc/kde4automoc.cpp @@ -1,9 +1,10 @@ /* This file is part of the KDE project Copyright (C) 2007 Matthias Kretz - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 - as published by the Free Software Foundation. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -117,7 +118,9 @@ bool AutoMoc::run() line = dotFiles.readLine().trimmed(); const QStringList incPaths = QString::fromUtf8(line).split(';'); foreach (const QString &path, incPaths) { - mocIncludes << "-I" + path; + if (!path.isEmpty()) { + mocIncludes << "-I" + path; + } } line = dotFiles.readLine(); Q_ASSERT(line == "SOURCES:\n"); -- cgit v1.2.1