diff options
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 1 | ||||
-rw-r--r-- | src/tools/moc/generator.cpp | 2 | ||||
-rw-r--r-- | src/tools/rcc/rcc.cpp | 6 | ||||
-rw-r--r-- | src/tools/uic/cpp/cppwritedeclaration.h | 14 | ||||
-rw-r--r-- | src/tools/uic/cpp/cppwriteincludes.h | 18 | ||||
-rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.h | 28 | ||||
-rw-r--r-- | src/tools/uic/customwidgetsinfo.h | 6 | ||||
-rw-r--r-- | src/tools/uic/databaseinfo.h | 4 | ||||
-rw-r--r-- | src/tools/uic/validator.h | 12 |
9 files changed, 48 insertions, 43 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 042ad7adb9..03d5e44405 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -45,6 +45,7 @@ SOURCES += \ ../../corelib/io/qiodevice.cpp \ ../../corelib/io/qfiledevice.cpp \ ../../corelib/io/qresource.cpp \ + ../../corelib/io/qtemporarydir.cpp \ ../../corelib/io/qtemporaryfile.cpp \ ../../corelib/io/qtextstream.cpp \ ../../corelib/io/qsavefile.cpp \ diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index 1e17e00050..d299cdad51 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -1269,7 +1269,7 @@ void Generator::generateStaticMetacall() continue; anythingUsed = true; fprintf(out, " {\n"); - fprintf(out, " typedef %s (%s::*_t)(",f.type.rawName.constData() , cdef->classname.constData()); + fprintf(out, " using _t = %s (%s::*)(",f.type.rawName.constData() , cdef->classname.constData()); int argsCount = f.arguments.count(); for (int j = 0; j < argsCount; ++j) { diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp index 84fe6ef5c7..92d3c5c171 100644 --- a/src/tools/rcc/rcc.cpp +++ b/src/tools/rcc/rcc.cpp @@ -207,7 +207,11 @@ void RCCFileInfo::writeDataInfo(RCCResourceLibrary &lib) if (lib.formatVersion() >= 2) { // last modified time stamp const QDateTime lastModified = m_fileInfo.lastModified(); - lib.writeNumber8(quint64(lastModified.isValid() ? lastModified.toMSecsSinceEpoch() : 0)); + quint64 lastmod = quint64(lastModified.isValid() ? lastModified.toMSecsSinceEpoch() : 0); + static const quint64 sourceDate = 1000 * qgetenv("QT_RCC_SOURCE_DATE_OVERRIDE").toULongLong(); + if (sourceDate != 0) + lastmod = sourceDate; + lib.writeNumber8(lastmod); if (text || pass1) lib.writeChar('\n'); } diff --git a/src/tools/uic/cpp/cppwritedeclaration.h b/src/tools/uic/cpp/cppwritedeclaration.h index ca2122293c..f83bfe8f50 100644 --- a/src/tools/uic/cpp/cppwritedeclaration.h +++ b/src/tools/uic/cpp/cppwritedeclaration.h @@ -45,13 +45,13 @@ struct WriteDeclaration : public TreeWalker { WriteDeclaration(Uic *uic); - void acceptUI(DomUI *node) Q_DECL_OVERRIDE; - void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; - void acceptSpacer(DomSpacer *node) Q_DECL_OVERRIDE; - void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE; - void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE; - void acceptAction(DomAction *node) Q_DECL_OVERRIDE; - void acceptButtonGroup(const DomButtonGroup *buttonGroup) Q_DECL_OVERRIDE; + void acceptUI(DomUI *node) override; + void acceptWidget(DomWidget *node) override; + void acceptSpacer(DomSpacer *node) override; + void acceptLayout(DomLayout *node) override; + void acceptActionGroup(DomActionGroup *node) override; + void acceptAction(DomAction *node) override; + void acceptButtonGroup(const DomButtonGroup *buttonGroup) override; private: Uic *m_uic; diff --git a/src/tools/uic/cpp/cppwriteincludes.h b/src/tools/uic/cpp/cppwriteincludes.h index 0d9c293efc..f91e1cf8ff 100644 --- a/src/tools/uic/cpp/cppwriteincludes.h +++ b/src/tools/uic/cpp/cppwriteincludes.h @@ -49,23 +49,23 @@ struct WriteIncludes : public TreeWalker { WriteIncludes(Uic *uic); - void acceptUI(DomUI *node) Q_DECL_OVERRIDE; - void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; - void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE; - void acceptSpacer(DomSpacer *node) Q_DECL_OVERRIDE; - void acceptProperty(DomProperty *node) Q_DECL_OVERRIDE; + void acceptUI(DomUI *node) override; + void acceptWidget(DomWidget *node) override; + void acceptLayout(DomLayout *node) override; + void acceptSpacer(DomSpacer *node) override; + void acceptProperty(DomProperty *node) override; // // custom widgets // - void acceptCustomWidgets(DomCustomWidgets *node) Q_DECL_OVERRIDE; - void acceptCustomWidget(DomCustomWidget *node) Q_DECL_OVERRIDE; + void acceptCustomWidgets(DomCustomWidgets *node) override; + void acceptCustomWidget(DomCustomWidget *node) override; // // include hints // - void acceptIncludes(DomIncludes *node) Q_DECL_OVERRIDE; - void acceptInclude(DomInclude *node) Q_DECL_OVERRIDE; + void acceptIncludes(DomIncludes *node) override; + void acceptInclude(DomInclude *node) override; private: void add(const QString &className, bool determineHeader = true, const QString &header = QString(), bool global = false); diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h index b26f51875d..64cbde13f7 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -93,41 +93,41 @@ struct WriteInitialization : public TreeWalker // // widgets // - void acceptUI(DomUI *node) Q_DECL_OVERRIDE; - void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; + void acceptUI(DomUI *node) override; + void acceptWidget(DomWidget *node) override; - void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE; - void acceptSpacer(DomSpacer *node) Q_DECL_OVERRIDE; - void acceptLayoutItem(DomLayoutItem *node) Q_DECL_OVERRIDE; + void acceptLayout(DomLayout *node) override; + void acceptSpacer(DomSpacer *node) override; + void acceptLayoutItem(DomLayoutItem *node) override; // // actions // - void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE; - void acceptAction(DomAction *node) Q_DECL_OVERRIDE; - void acceptActionRef(DomActionRef *node) Q_DECL_OVERRIDE; + void acceptActionGroup(DomActionGroup *node) override; + void acceptAction(DomAction *node) override; + void acceptActionRef(DomActionRef *node) override; // // tab stops // - void acceptTabStops(DomTabStops *tabStops) Q_DECL_OVERRIDE; + void acceptTabStops(DomTabStops *tabStops) override; // // custom widgets // - void acceptCustomWidgets(DomCustomWidgets *node) Q_DECL_OVERRIDE; - void acceptCustomWidget(DomCustomWidget *node) Q_DECL_OVERRIDE; + void acceptCustomWidgets(DomCustomWidgets *node) override; + void acceptCustomWidget(DomCustomWidget *node) override; // // layout defaults/functions // - void acceptLayoutDefault(DomLayoutDefault *node) Q_DECL_OVERRIDE { m_LayoutDefaultHandler.acceptLayoutDefault(node); } - void acceptLayoutFunction(DomLayoutFunction *node) Q_DECL_OVERRIDE { m_LayoutDefaultHandler.acceptLayoutFunction(node); } + void acceptLayoutDefault(DomLayoutDefault *node) override { m_LayoutDefaultHandler.acceptLayoutDefault(node); } + void acceptLayoutFunction(DomLayoutFunction *node) override { m_LayoutDefaultHandler.acceptLayoutFunction(node); } // // signal/slot connections // - void acceptConnection(DomConnection *connection) Q_DECL_OVERRIDE; + void acceptConnection(DomConnection *connection) override; enum { Use43UiFile = 0, diff --git a/src/tools/uic/customwidgetsinfo.h b/src/tools/uic/customwidgetsinfo.h index 3ce27d546c..944ed59215 100644 --- a/src/tools/uic/customwidgetsinfo.h +++ b/src/tools/uic/customwidgetsinfo.h @@ -43,10 +43,10 @@ class CustomWidgetsInfo : public TreeWalker public: CustomWidgetsInfo(); - void acceptUI(DomUI *node) Q_DECL_OVERRIDE; + void acceptUI(DomUI *node) override; - void acceptCustomWidgets(DomCustomWidgets *node) Q_DECL_OVERRIDE; - void acceptCustomWidget(DomCustomWidget *node) Q_DECL_OVERRIDE; + void acceptCustomWidgets(DomCustomWidgets *node) override; + void acceptCustomWidget(DomCustomWidget *node) override; inline QStringList customWidgets() const { return m_customWidgets.keys(); } diff --git a/src/tools/uic/databaseinfo.h b/src/tools/uic/databaseinfo.h index c313681278..bebf139c5a 100644 --- a/src/tools/uic/databaseinfo.h +++ b/src/tools/uic/databaseinfo.h @@ -42,8 +42,8 @@ class DatabaseInfo : public TreeWalker public: DatabaseInfo(); - void acceptUI(DomUI *node) Q_DECL_OVERRIDE; - void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; + void acceptUI(DomUI *node) override; + void acceptWidget(DomWidget *node) override; inline QStringList connections() const { return m_connections; } diff --git a/src/tools/uic/validator.h b/src/tools/uic/validator.h index e0a99b47ef..f7f7401991 100644 --- a/src/tools/uic/validator.h +++ b/src/tools/uic/validator.h @@ -43,14 +43,14 @@ struct Validator : public TreeWalker { Validator(Uic *uic); - void acceptUI(DomUI *node) Q_DECL_OVERRIDE; - void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; + void acceptUI(DomUI *node) override; + void acceptWidget(DomWidget *node) override; - void acceptLayoutItem(DomLayoutItem *node) Q_DECL_OVERRIDE; - void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE; + void acceptLayoutItem(DomLayoutItem *node) override; + void acceptLayout(DomLayout *node) override; - void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE; - void acceptAction(DomAction *node) Q_DECL_OVERRIDE; + void acceptActionGroup(DomActionGroup *node) override; + void acceptAction(DomAction *node) override; private: Driver *m_driver; |