summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@trolltech.com>2009-04-02 11:27:03 (GMT)
committerJoerg Bornemann <joerg.bornemann@trolltech.com>2009-04-02 11:32:24 (GMT)
commitba1dee09daef790883e53d91f4f02865c75e6d57 (patch)
tree6eb0903e561999a44c8ae482cb025637c33d1fe3
parent16f691bad83a29c7c7fdeb3398a3fdadfdaa2949 (diff)
downloadQt-ba1dee09daef790883e53d91f4f02865c75e6d57.zip
Qt-ba1dee09daef790883e53d91f4f02865c75e6d57.tar.gz
Qt-ba1dee09daef790883e53d91f4f02865c75e6d57.tar.bz2
cosmetic bug in qmake msvc_nmake generator fixed
When generating nmake makefiles, the same inference rules were generated several times. Reviewed-by: mariusSO
-rw-r--r--qmake/generators/win32/msvc_nmake.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 4b1b66d..b5904cc 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -244,14 +244,14 @@ void NmakeMakefileGenerator::writeImplicitRulesPart(QTextStream &t)
project->variables().remove("QMAKE_RUN_CC");
QHash<QString, void*> source_directories;
- source_directories.insertMulti(".", (void*)1);
+ source_directories.insert(".", (void*)1);
QString directories[] = { QString("UI_SOURCES_DIR"), QString("UI_DIR"), QString() };
for(int y = 0; !directories[y].isNull(); y++) {
QString dirTemp = project->first(directories[y]);
if (dirTemp.endsWith("\\"))
dirTemp.truncate(dirTemp.length()-1);
if(!dirTemp.isEmpty())
- source_directories.insertMulti(dirTemp, (void*)1);
+ source_directories.insert(dirTemp, (void*)1);
}
QString srcs[] = { QString("SOURCES"), QString("GENERATED_SOURCES"), QString() };
for(int x = 0; !srcs[x].isNull(); x++) {
@@ -262,7 +262,7 @@ void NmakeMakefileGenerator::writeImplicitRulesPart(QTextStream &t)
sep = "/";
QString dir = (*sit).section(sep, 0, -2);
if(!dir.isEmpty() && !source_directories[dir])
- source_directories.insertMulti(dir, (void*)1);
+ source_directories.insert(dir, (void*)1);
}
}