Changeset 898


Ignore:
Timestamp:
Jul 19, 2011, 5:07:23 PM (9 years ago)
Author:
Dmitry A. Kuminov
Message:

qmake: No need to put QMAKE_PRL_BUILD_DIR to .prl when targeting OS/2.

This avoids possible confusion when the .prl is installed on the end
user's machine since QMAKE_PRL_BUILD_DIR would contain a path to a
directory on the build machine which is most likely invalid anywhere
else.

File:
1 edited

Legend:

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

    r897 r898  
    964964    if(slsh != -1)
    965965        target.remove(0, slsh + 1);
    966     QString bdir = Option::output_dir;
    967     if(bdir.isEmpty())
    968         bdir = qmake_getpwd();
    969     t << "QMAKE_PRL_BUILD_DIR = " << bdir << endl;
     966
     967    if (Option::target_mode != Option::TARG_OS2_MODE) {
     968        // QMAKE_PRL_BUILD_DIR is not used on OS/2 so don't add it to avoid
     969        // possible confusion by exposing the full path to the build directory
     970        QString bdir = Option::output_dir;
     971        if(bdir.isEmpty())
     972            bdir = qmake_getpwd();
     973        t << "QMAKE_PRL_BUILD_DIR = " << bdir << endl;
     974    }
    970975
    971976    if(!project->projectFile().isEmpty() && project->projectFile() != "-")
Note: See TracChangeset for help on using the changeset viewer.