diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2011-11-15 16:28:12 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-11-15 16:28:12 (GMT) |
| commit | 7793fe4290ac7d34b7fb219b7f0624d1c5ad5f0e (patch) | |
| tree | f7c07a2d08461be0e5c761578bf69c8cb83c113a /qmake | |
| parent | f94eea0176e7ecd2c9c6a748259e08a4361d9478 (diff) | |
| download | Qt-7793fe4290ac7d34b7fb219b7f0624d1c5ad5f0e.zip Qt-7793fe4290ac7d34b7fb219b7f0624d1c5ad5f0e.tar.gz Qt-7793fe4290ac7d34b7fb219b7f0624d1c5ad5f0e.tar.bz2 | |
Change the overload from write() to writeMakefile() in INTEGRITY generator
This way, INTEGRITY-specific generation is only called in
Makefile mode.
Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/integrity/gbuild.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/integrity/gbuild.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/integrity/gbuild.cpp b/qmake/generators/integrity/gbuild.cpp index f9fdb38..df246cd 100644 --- a/qmake/generators/integrity/gbuild.cpp +++ b/qmake/generators/integrity/gbuild.cpp @@ -64,7 +64,7 @@ GBuildMakefileGenerator::GBuildMakefileGenerator() : MakefileGenerator() } bool -GBuildMakefileGenerator::write() +GBuildMakefileGenerator::writeMakefile(QTextStream &text) { QStringList tmp; QString filename(Option::output.fileName()); diff --git a/qmake/generators/integrity/gbuild.h b/qmake/generators/integrity/gbuild.h index 0927a2e..6f9a5c0 100644 --- a/qmake/generators/integrity/gbuild.h +++ b/qmake/generators/integrity/gbuild.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class GBuildMakefileGenerator : public MakefileGenerator { - virtual bool write(); + virtual bool writeMakefile(QTextStream &text); QString projectSuffix() const { return QString(".gpj"); }; QString writeOne(QString filename, QString pathtoremove = ""); |