Changeset 887


Ignore:
Timestamp:
Jul 13, 2011, 12:40:40 PM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

qmake: Reverted r162 since TARGET_SHORT does not affect .lib names any more.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/qmake/generators/makefile.cpp

    r886 r887  
    11131113MakefileGenerator::writePrlFile()
    11141114{
    1115     // note: on OS/2, we need .prl even for plugins since we use
    1116     // QMAKE_PRL_TARGET from there to translate universally used long plugin
    1117     // names to short names of actual OS/2 DLL libraries (which cannot exceed
    1118     // the 8x3 limit)
    1119 
    11201115    if((Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
    11211116            Option::qmake_mode == Option::QMAKE_GENERATE_PRL)
     
    11241119       && (project->first("TEMPLATE") == "lib"
    11251120       || project->first("TEMPLATE") == "vclib")
    1126        && (project->isActiveConfig("os2") || !project->isActiveConfig("plugin"))
    1127        ) { //write prl file
     1121       && !project->isActiveConfig("plugin")) { //write prl file
    11281122        QString local_prl = prlFileName();
    11291123        QString prl = fileFixify(local_prl);
Note: See TracChangeset for help on using the changeset viewer.