diff options
author | Liang Qi <liang.qi@digia.com> | 2012-12-15 14:53:20 (GMT) |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-15 16:34:50 (GMT) |
commit | 91e8baa37baea4a79641c1eb0512d609745a033b (patch) | |
tree | 618d953ec849243d0f71e9be08276332a3c06238 /src | |
parent | 21666e3857cc9d4c93c6179490c1df46a795de53 (diff) | |
download | Qt-91e8baa37baea4a79641c1eb0512d609745a033b.zip Qt-91e8baa37baea4a79641c1eb0512d609745a033b.tar.gz Qt-91e8baa37baea4a79641c1eb0512d609745a033b.tar.bz2 |
Remove the timestamp info in genarated files
For moc, rcc and uic, then it's friendly for tools like ccache.
ccache is using md5 to check file modification, but the different
timestamp info will cause different md5 for same meaningful
contents, it will disabled ccache.
Updated the autotest for uic and rcc.
Task-number: QTBUG-26589
Change-Id: I9e72ff022f722809b3f86bd9d7e0ae1e470e8eb2
(back port from qtbase/139f416237c52575b236c3b61e25796c83034567)
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/tools/moc/moc.cpp | 6 | ||||
-rw-r--r-- | src/tools/rcc/rcc.cpp | 4 | ||||
-rw-r--r-- | src/tools/uic/uic.cpp | 3 |
3 files changed, 3 insertions, 10 deletions
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index 947fc8e..aecc949 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -766,9 +766,6 @@ void Moc::parse() void Moc::generate(FILE *out) { - - QDateTime dt = QDateTime::currentDateTime(); - QByteArray dstr = dt.toString().toLatin1(); QByteArray fn = filename; int i = filename.length()-1; while (i>0 && filename[i-1] != '/' && filename[i-1] != '\\') @@ -777,8 +774,7 @@ void Moc::generate(FILE *out) fn = filename.mid(i); fprintf(out, "/****************************************************************************\n" "** Meta object code from reading C++ file '%s'\n**\n" , (const char*)fn); - fprintf(out, "** Created: %s\n" - "** by: The Qt Meta Object Compiler version %d (Qt %s)\n**\n" , dstr.data(), mocOutputRevision, QT_VERSION_STR); + fprintf(out, "** Created by: The Qt Meta Object Compiler version %d (Qt %s)\n**\n" , mocOutputRevision, QT_VERSION_STR); fprintf(out, "** WARNING! All changes made in this file will be lost!\n" "*****************************************************************************/\n\n"); diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp index 55d2aad..9fcc017 100644 --- a/src/tools/rcc/rcc.cpp +++ b/src/tools/rcc/rcc.cpp @@ -731,9 +731,7 @@ bool RCCResourceLibrary::writeHeader() writeString("/****************************************************************************\n"); writeString("** Resource object code\n"); writeString("**\n"); - writeString("** Created: "); - writeByteArray(QDateTime::currentDateTime().toString().toLatin1()); - writeString("\n** by: The Resource Compiler for Qt version "); + writeString("** Created by: The Resource Compiler for Qt version "); writeByteArray(QT_VERSION_STR); writeString("\n**\n"); writeString("** WARNING! All changes made in this file will be lost!\n"); diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp index 7e35679..93dd33a 100644 --- a/src/tools/uic/uic.cpp +++ b/src/tools/uic/uic.cpp @@ -139,8 +139,7 @@ void Uic::writeCopyrightHeader(DomUI *ui) out << "/********************************************************************************\n"; out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; out << "**\n"; - out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; - out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); + out << "** Created by: Qt User Interface Compiler version " << QLatin1String(QT_VERSION_STR) << "\n"; out << "**\n"; out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; out << "********************************************************************************/\n\n"; |