Changeset 982 for trunk

Timestamp:

Aug 14, 2011, 10:05:17 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Remove duplicates from INCPATH and QMAKE_LIBDIR.

This is to keep the generated Makefiles clean. Does not effect the
behavior in any way. Affects all generator based on Win32MakeFileGenerator
(including the OS/2 one).

File:

• trunk/qmake/generators/win32/winmakefile.cpp (modified) (1 diff)

trunk/qmake/generators/win32/winmakefile.cpp

@@ -324 +324 @@
     QStringList &incDir = project->values("INCLUDEPATH");
     for(QStringList::Iterator incDir_it = incDir.begin(); incDir_it != incDir.end(); ++incDir_it) {
-    if(!(*incDir_it).isEmpty())
-        (*incDir_it) = Option::fixPathToTargetOS((*incDir_it), false, false);
-    }
+        if(!(*incDir_it).isEmpty())
+            (*incDir_it) = Option::fixPathToTargetOS((*incDir_it), false, false);
+    }
+    incDir.removeDuplicates();
+
     QStringList &libDir = project->values("QMAKE_LIBDIR");
     for(QStringList::Iterator libDir_it = libDir.begin(); libDir_it != libDir.end(); ++libDir_it) {
-    if(!(*libDir_it).isEmpty())
-        (*libDir_it) = Option::fixPathToTargetOS((*libDir_it), false, false);
-    }
+        if(!(*libDir_it).isEmpty())
+            (*libDir_it) = Option::fixPathToTargetOS((*libDir_it), false, false);
+    }
+    libDir.removeDuplicates();
 }