diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2011-11-15 16:28:24 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-11-15 16:28:24 (GMT) |
| commit | ea1f480170a285b2c46e934ce32af10f59b9d1fa (patch) | |
| tree | 085d76c2f822dec2714f6c5ba242f4a91c7e35a1 /qmake | |
| parent | 0f808217dc6d1dbdfd1beeef4fecc24128eaac7b (diff) | |
| download | Qt-ea1f480170a285b2c46e934ce32af10f59b9d1fa.zip Qt-ea1f480170a285b2c46e934ce32af10f59b9d1fa.tar.gz Qt-ea1f480170a285b2c46e934ce32af10f59b9d1fa.tar.bz2 | |
Make sure QMAKE_CXX is defined to prevent crashing on some projects.
Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/integrity/gbuild.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qmake/generators/integrity/gbuild.cpp b/qmake/generators/integrity/gbuild.cpp index dd20321..ffb2d0a 100644 --- a/qmake/generators/integrity/gbuild.cpp +++ b/qmake/generators/integrity/gbuild.cpp @@ -218,7 +218,9 @@ GBuildMakefileGenerator::writeMakefile(QTextStream &text) warn_msg(WarnParser, Option::output.fileName().toAscii()); QTextStream t(&Option::output); - QString primaryTarget(project->values("QMAKE_CXX").at(0)); + QString primaryTarget; + if (!project->values("QMAKE_CXX").isEmpty()) + primaryTarget = project->values("QMAKE_CXX").at(0); pathtoremove += QDir::separator(); filename.remove(qmake_getpwd()); |