diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 18:52:38 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 18:52:38 +0100 |
commit | f6dbdd9c16166f345fd5743886229192c97c2c4f (patch) | |
tree | 05e5e7b806dd627be4e3ba6fc9a32f115847acb0 /src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | |
parent | b8084618545570a8832d344a2e9586e1226cc697 (diff) | |
parent | 47efa9213d92a4366e03bd6d056837cd5bbadb1e (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/sql/drivers/sqlite/qsql_sqlite.cpp
Change-Id: Ia7cffd2c99ae3d5eea6b5740683c06e921336dcd
Diffstat (limited to 'src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp')
-rw-r--r-- | src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp index 6dd88824b5..560b58817e 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp @@ -43,6 +43,7 @@ #include <qdatetime.h> #include <qdebug.h> #include <qfile.h> +#include <qfileinfo.h> #include <qstring.h> #include <qstringlist.h> #include <qtextstream.h> @@ -65,6 +66,7 @@ static QString parentClassName; static QString proxyFile; static QString adaptorFile; static QString inputFile; +static QDateTime classCreationTime; static bool skipNamespaces; static bool verbose; static bool includeMocs; @@ -216,10 +218,13 @@ static void parseCmdLine(QStringList args) static QDBusIntrospection::Interfaces readInput() { QFile input(inputFile); - if (inputFile.isEmpty() || inputFile == QLatin1String("-")) + if (inputFile.isEmpty() || inputFile == QLatin1String("-")) { input.open(stdin, QIODevice::ReadOnly); - else + classCreationTime = QDateTime::currentDateTime(); + } else { input.open(QIODevice::ReadOnly); + classCreationTime = QFileInfo(input).lastModified(); + } QByteArray data = input.readAll(); @@ -556,7 +561,7 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf } includeGuard = QString(QLatin1String("%1_%2")) .arg(includeGuard) - .arg(QDateTime::currentDateTime().toTime_t()); + .arg(classCreationTime.toTime_t()); hs << "#ifndef " << includeGuard << endl << "#define " << includeGuard << endl << endl; |