diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-11-23 12:29:10 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-11-23 12:43:58 (GMT) |
| commit | 1689f5c557f686b7ad0ab68385402e928e590a13 (patch) | |
| tree | 1052d2df36afd5f79b8fee6b68be5219bd9c757a /qmake | |
| parent | 88f1ac8054146e6fd89370c5d24b0c84884ccfc9 (diff) | |
| download | Qt-1689f5c557f686b7ad0ab68385402e928e590a13.zip Qt-1689f5c557f686b7ad0ab68385402e928e590a13.tar.gz Qt-1689f5c557f686b7ad0ab68385402e928e590a13.tar.bz2 | |
Use parent class function to generate Makefile headers in Symbian
Qt Creator depends on some of the information generated into the
makefile header by MakefileGenerator::writeHeader() function, so
changed symmake*.cpp to use it instead of each having separate
code for header generation.
Task-number: QTBUG-15539
Reviewed-by: Janne Koskinen
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/symbian/symmake_abld.cpp | 11 | ||||
| -rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.cpp | 12 |
2 files changed, 3 insertions, 20 deletions
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index cd64325..eb39d36 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -184,16 +184,7 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool QTextStream t(&wrapperFile); - t << "# ==============================================================================" << endl; - t << "# Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: "; - t << QDateTime::currentDateTime().toString() << endl; - t << "# This file is generated by qmake and should not be modified by the" << endl; - t << "# user." << endl; - t << "# Name : " << wrapperFile.fileName() << endl; - t << "# Description : Wrapper Makefile for calling Symbian build tools" << endl; - t << "#" << endl; - t << "# ==============================================================================" << "\n" << endl; - t << endl; + MakefileGenerator::writeHeader(t); t << "MAKEFILE = " << fileInfo(wrapperFile.fileName()).fileName() << endl; t << "QMAKE = " << var("QMAKE_QMAKE") << endl; diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index f4a6132..c4b51f2 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -324,16 +324,8 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo QTextStream t(&wrapperFile); - t << "# ==============================================================================" << endl; - t << "# Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: "; - t << QDateTime::currentDateTime().toString() << endl; - t << "# This file is generated by qmake and should not be modified by the" << endl; - t << "# user." << endl; - t << "# Name : " << wrapperFile.fileName() << endl; - t << "# Description : Wrapper Makefile for calling Symbian build tools" << endl; - t << "#" << endl; - t << "# ==============================================================================" << "\n" << endl; - t << endl; + MakefileGenerator::writeHeader(t); + t << "MAKEFILE = " << fileInfo(wrapperFile.fileName()).fileName() << endl; t << "QMAKE = " << var("QMAKE_QMAKE") << endl; t << "DEL_FILE = " << var("QMAKE_DEL_FILE") << endl; |