diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2011-11-15 16:28:16 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-11-15 16:28:16 (GMT) |
| commit | ef2f939effb8e0684b5832eb03c71b1427437526 (patch) | |
| tree | 63d11721c4f5493e305a07b2ad5fdf8b61c0acb8 /qmake | |
| parent | 96f9dd665f0bd56fc39a327481ba440c6d8450bd (diff) | |
| download | Qt-ef2f939effb8e0684b5832eb03c71b1427437526.zip Qt-ef2f939effb8e0684b5832eb03c71b1427437526.tar.gz Qt-ef2f939effb8e0684b5832eb03c71b1427437526.tar.bz2 | |
Do not generate -D defines for project types.
Options are implicitly inherited from project to subprojects
and applications, so there is no need to respecify them.
Worse, if an app/lib disables an option, the project might
still have the define enabled, forcing it also onto the app/lib.
This prevents double-define or this kind of conflict.
Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/integrity/gbuild.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/generators/integrity/gbuild.cpp b/qmake/generators/integrity/gbuild.cpp index fcadec0..658bb3c 100644 --- a/qmake/generators/integrity/gbuild.cpp +++ b/qmake/generators/integrity/gbuild.cpp @@ -273,7 +273,8 @@ GBuildMakefileGenerator::writeMakefile(QTextStream &text) } t << "\n"; - t << varGlue("DEFINES", "\t-D", "\n\t-D", "\n"); + if (project->first("TEMPLATE") != "project") + t << varGlue("DEFINES", "\t-D", "\n\t-D", "\n"); t << "\t-I.\n\t-I" << specdir() << "\n"; t << varGlue("INCLUDEPATH", "\t-I", "\n\t-I", "\n"); |