diff options
| author | Fredrik Orderud <fredrik.orderud@ge.com> | 2019-08-28 09:19:05 +0200 |
|---|---|---|
| committer | Fredrik Orderud <fredrik.orderud@ge.com> | 2019-08-30 07:03:02 +0200 |
| commit | 7b2dfb37ee5a4252d83e7b08970107a15561fe61 (patch) | |
| tree | c560c12da117de956ae99a257818490211da5419 | |
| parent | 02a62094876c51b71f5922d168305ffc970f24c6 (diff) | |
Remove hardcoded qt_instdate field from binary
Move hardcoded date to the only client code in the repo.
This field is currently modified by MaintenanceTool and possibly windeployqt,
which contributes to breaking the DLL signature on Windows. Removing the field
should avoid this problem.
Task-number: QTBUG-76985
Change-Id: I01386136ac493ea50c99c05879a3e215f3f6344c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | configure.pri | 3 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/configure.pri b/configure.pri index 09c34af4ee..b109192beb 100644 --- a/configure.pri +++ b/configure.pri @@ -835,9 +835,6 @@ defineTest(qtConfOutput_preparePaths) { addConfStr($$[QMAKE_SPEC]) $${currentConfig}.output.qconfigSource = \ - "/* Installation date */" \ - "static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \ - "" \ "/* Installation Info */" \ "static const char qt_configure_prefix_path_str [12+256] = \"qt_prfxpath=$$config.input.prefix\";" \ "$${LITERAL_HASH}ifdef QT_BUILD_QMAKE" \ diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index c0a5369cdd..5634d6e6c3 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -274,7 +274,7 @@ QLibraryInfo::licensedProducts() QDate QLibraryInfo::buildDate() { - return QDate::fromString(QString::fromLatin1(qt_configure_installation + 12), Qt::ISODate); + return QDate::fromString(QString::fromLatin1("2012-12-20"), Qt::ISODate); } #endif #endif // datestring |