diff options
| author | Timothy Pearson <[email protected]> | 2011-12-05 22:07:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-05 22:07:55 -0600 |
| commit | 3ad1b623ac4af0f19db3580e4ef6b0d923260ba0 (patch) | |
| tree | 3b77748c913634d88310c7933877b201532d4ae1 /qmake/generators/makefile.cpp | |
| parent | e02e31c8b9d854cd62cbe9799228f6e08e882773 (diff) | |
| download | tqt3-3ad1b623ac4af0f19db3580e4ef6b0d923260ba0.tar.gz tqt3-3ad1b623ac4af0f19db3580e4ef6b0d923260ba0.zip | |
Sync again
Diffstat (limited to 'qmake/generators/makefile.cpp')
| -rw-r--r-- | qmake/generators/makefile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index e937570a9..c769e93eb 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1427,7 +1427,7 @@ MakefileGenerator::write() findLibraries(); if((Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE || //write prl Option::qmake_mode == Option::QMAKE_GENERATE_PRL) && - project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty() && + project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty() && project->isActiveConfig("create_prl") && project->first("TEMPLATE") == "lib" && !project->isActiveConfig("plugin")) { TQString prl = var("TARGET"); @@ -2160,7 +2160,7 @@ bool MakefileGenerator::writeMakeQmake(TQTextStream &t) { TQString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.name())); - if(project->isEmpty("QMAKE_FAILED_RETQUIREMENTS") && !project->isActiveConfig("no_autoqmake") && + if(project->isEmpty("QMAKE_FAILED_REQUIREMENTS") && !project->isActiveConfig("no_autoqmake") && !project->isEmpty("QMAKE_INTERNAL_PRL_FILE")) { TQStringList files = fileFixify(Option::mkfile::project_files); t << project->first("QMAKE_INTERNAL_PRL_FILE") << ": " << "\n\t" |