diff options
Diffstat (limited to 'qmake/generators/makefile.cpp')
| -rw-r--r-- | qmake/generators/makefile.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 9b46b89..7f25444 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1183,7 +1183,7 @@ MakefileGenerator::init() Option::fixPathToTargetOS(imgfile); if(!project->isEmpty("UI_DIR") || !project->isEmpty("UI_SOURCES_DIR")) { if(imgfile.find(Option::dir_sep) != -1) - imgfile = imgfile.right(imgfile.findRev(Option::dir_sep) + 1); + imgfile = imgfile.mid(imgfile.findRev(Option::dir_sep) + 1); imgfile.prepend( (project->isEmpty("UI_DIR") ? project->first("UI_SOURCES_DIR") : project->first("UI_DIR")) ); v["QMAKE_IMAGE_COLLECTION"] = QStringList(imgfile); @@ -1433,7 +1433,7 @@ MakefileGenerator::write() QString prl = var("TARGET"); int slsh = prl.findRev(Option::dir_sep); if(slsh != -1) - prl = prl.right(prl.length() - slsh); + prl = prl.right(prl.length() - slsh - 1); int dot = prl.find('.'); if(dot != -1) prl = prl.left(dot); @@ -2142,10 +2142,9 @@ QString MakefileGenerator::build_args() bool MakefileGenerator::writeHeader(QTextStream &t) { - time_t foo = time(NULL); t << "#############################################################################" << endl; t << "# Makefile for building: " << var("TARGET") << endl; - t << "# Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: " << ctime(&foo); + t << "# Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ")" << endl; t << "# Project: " << fileFixify(project->projectFile()) << endl; t << "# Template: " << var("TEMPLATE") << endl; t << "# Command: " << build_args() << endl; |