Changeset 8 for trunk/qmake/generators/win32

Timestamp:

Nov 16, 2005, 8:36:46 PM (20 years ago)

Author:

dmik

Message:

Transferred Qt for OS/2 version 3.3.1-rc5 sources from the CVS

File:

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

trunk/qmake/generators/win32/msvc_nmake.cpp

@@ -81 +81 @@
 {
     QStringList &aList = MakefileGenerator::findDependencies(file);
-    // Note: The QMAKE_IMAGE_COLLECTION file have all images
-    // as dependency, so don't add precompiled header then
-    if (file == project->first("QMAKE_IMAGE_COLLECTION"))
-        return aList;
-    for(QStringList::Iterator it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it) {
-        if(file.endsWith(*it)) {
-            if(!aList.contains(precompH))
-                aList += precompH;
-            break;
-        }
+    // [dmik] this method can be called from MakefileGenerator::init() before
+    // precompH is set in NmakeMakefileGenerator::init(), so we check it
+    // to avoid appending of NULL string to the list of dependencies
+    if (!precompH.isNull()) {
+        // Note: The QMAKE_IMAGE_COLLECTION file have all images
+        // as dependency, so don't add precompiled header then
+        if (file == project->first("QMAKE_IMAGE_COLLECTION"))
+            return aList;
+        for(QStringList::Iterator it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it) {
+            if(file.endsWith(*it)) {
+                if(!aList.contains(precompH))
+                    aList += precompH;
+                break;
+            }
+        }
     }
     return aList;