Changeset 896


Ignore:
Timestamp:
Jul 18, 2011, 7:37:43 PM (9 years ago)
Author:
Dmitry A. Kuminov
Message:

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

Location:
trunk/qmake/generators
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/qmake/generators/os2/gnumake.cpp

    r889 r896  
    657657}
    658658
     659QString GNUMakefileGenerator::getPdbTarget()
     660{
     661    // we don't have .pdb files (.map and .sym are processed elsewere)
     662    return QString::null;
     663}
     664
    659665QStringList &GNUMakefileGenerator::findDependencies(const QString &file)
    660666{
  • trunk/qmake/generators/os2/gnumake.h

    r886 r896  
    7373    void processPrlFiles();
    7474
     75    QString getPdbTarget();
     76
    7577    QStringList &findDependencies(const QString &file);
    7678
  • trunk/qmake/generators/win32/winmakefile.cpp

    r886 r896  
    845845        if(project->isActiveConfig("shared") && project->isActiveConfig("debug")) {
    846846            QString pdb_target = getPdbTarget();
    847             pdb_target.remove('"');
    848             QString src_targ = (project->isEmpty("DESTDIR") ? QString("$(DESTDIR)") : project->first("DESTDIR")) + pdb_target;
    849             QString dst_targ = filePrefixRoot(root, fileFixify(targetdir + pdb_target, FileFixifyAbsolute));
    850             if(!ret.isEmpty())
    851                 ret += "\n\t";
    852             ret += QString("-$(INSTALL_FILE)") + " \"" + src_targ + "\" \"" + dst_targ + "\"";
    853             if(!uninst.isEmpty())
    854                 uninst.append("\n\t");
    855             uninst.append("-$(DEL_FILE) \"" + dst_targ + "\"");
     847            if (!pdb_target.isEmpty()) {
     848                pdb_target.remove('"');
     849                QString src_targ = (project->isEmpty("DESTDIR") ? QString("$(DESTDIR)") : project->first("DESTDIR")) + pdb_target;
     850                QString dst_targ = filePrefixRoot(root, fileFixify(targetdir + pdb_target, FileFixifyAbsolute));
     851                if(!ret.isEmpty())
     852                    ret += "\n\t";
     853                ret += QString("-$(INSTALL_FILE)") + " \"" + src_targ + "\" \"" + dst_targ + "\"";
     854                if(!uninst.isEmpty())
     855                    uninst.append("\n\t");
     856                uninst.append("-$(DEL_FILE) \"" + dst_targ + "\"");
     857            }
    856858        }
    857859    }
Note: See TracChangeset for help on using the changeset viewer.