Changeset 896 for trunk/qmake

Timestamp:

Jul 18, 2011, 9:37:43 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: os2/gnumake: Don't try to install .pdb files.

Location:

trunk/qmake/generators

Files:

• os2/gnumake.cpp (modified) (1 diff)
• os2/gnumake.h (modified) (1 diff)
• win32/winmakefile.cpp (modified) (1 diff)

trunk/qmake/generators/os2/gnumake.cpp

@@ -657 +657 @@
 }
 
+
+
+
+
+
+
 QStringList &GNUMakefileGenerator::findDependencies(const QString &file)
 {

trunk/qmake/generators/os2/gnumake.h

@@ -73 +73 @@
     void processPrlFiles();
 
+
+
     QStringList &findDependencies(const QString &file);
 

trunk/qmake/generators/win32/winmakefile.cpp

@@ -845 +845 @@
         if(project->isActiveConfig("shared") && project->isActiveConfig("debug")) {
             QString pdb_target = getPdbTarget();
-            pdb_target.remove('"');
-            QString src_targ = (project->isEmpty("DESTDIR") ? QString("$(DESTDIR)") : project->first("DESTDIR")) + pdb_target;
-            QString dst_targ = filePrefixRoot(root, fileFixify(targetdir + pdb_target, FileFixifyAbsolute));
-            if(!ret.isEmpty())
-                ret += "\n\t";
-            ret += QString("-$(INSTALL_FILE)") + " \"" + src_targ + "\" \"" + dst_targ + "\"";
-            if(!uninst.isEmpty())
-                uninst.append("\n\t");
-            uninst.append("-$(DEL_FILE) \"" + dst_targ + "\"");
+            if (!pdb_target.isEmpty()) {
+                pdb_target.remove('"');
+                QString src_targ = (project->isEmpty("DESTDIR") ? QString("$(DESTDIR)") : project->first("DESTDIR")) + pdb_target;
+                QString dst_targ = filePrefixRoot(root, fileFixify(targetdir + pdb_target, FileFixifyAbsolute));
+                if(!ret.isEmpty())
+                    ret += "\n\t";
+                ret += QString("-$(INSTALL_FILE)") + " \"" + src_targ + "\" \"" + dst_targ + "\"";
+                if(!uninst.isEmpty())
+                    uninst.append("\n\t");
+                uninst.append("-$(DEL_FILE) \"" + dst_targ + "\"");
+            }
         }
     }