diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2011-08-31 14:23:42 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-02 14:11:41 +0200 |
| commit | 7493ee1c44a16dc3b155a5bf3ed7ca966a71072a (patch) | |
| tree | 035bd70088df3f23f8a689fb92097a70b7759b04 /src/corelib/global | |
| parent | e8192883b2d00b7a1b68fb7c7154a1e75bab0b26 (diff) | |
Remove the build-key from the plugin verification data
The build-key is an old mechanism to work around binary
incompatibilities in GCC 3.x versions. Modern GCC has not broken binary
compatibility since 3.4, making this mechanism obsolete.
The cache value stored now only includes Qt version, the debug/release
boolean, and the last modified time for the plugin. Old 4-value keys
will be replaced with new keys as the plugins are reloaded the first
time.
This also removes QLibraryInfo::buildKey(), which is a source-incompatible
change.
The UNIX and Windows configure tools have been updated to stop
outputting the QT_BUILD_KEY preprocessor directive.
See also:
http://lists.qt.nokia.com/pipermail/qt5-feedback/2011-August/000892.html
Change-Id: I7d06969a370d3d2c6de413c1230d9d6789cbf195
Reviewed-on: http://codereview.qt.nokia.com/3977
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.h | 7 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 27 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.h | 1 |
3 files changed, 0 insertions, 35 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 56022a7e6e..901f4e50ee 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -301,9 +301,6 @@ namespace QT_NAMESPACE {} #ifdef QT_AUTODETECT_COCOA # ifdef Q_OS_MAC64 # define QT_MAC_USE_COCOA 1 -# define QT_BUILD_KEY QT_BUILD_KEY_COCOA -# else -# define QT_BUILD_KEY QT_BUILD_KEY_CARBON # endif #endif @@ -1197,10 +1194,6 @@ Q_DECL_CONSTEXPR inline const T &qBound(const T &min, const T &val, const T &max class QDataStream; -#ifndef QT_BUILD_KEY -#define QT_BUILD_KEY "unspecified" -#endif - #if defined(Q_WS_MAC) # ifndef QMAC_QMENUBAR_NO_EVENT # define QMAC_QMENUBAR_NO_EVENT diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 88f12ab1f7..d70c77afae 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -203,21 +203,6 @@ QLibraryInfo::licensedProducts() } /*! - Returns a unique key identifying this build of Qt and its - configurations. This key is not globally unique, rather only useful - for establishing of two configurations are compatible. This can be - used to compare with the \c QT_BUILD_KEY preprocessor symbol. - - \sa location() -*/ - -QString -QLibraryInfo::buildKey() -{ - return QString::fromLatin1(QT_BUILD_KEY); -} - -/*! \since 4.6 Returns the installation date for this build of Qt. The install date will usually be the last time that Qt sources were configured. @@ -514,18 +499,6 @@ void qt_core_boilerplate() "Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).\n" "Contact: Nokia Corporation (qt-info@nokia.com)\n" "\n" - "Build key: " QT_BUILD_KEY "\n" - "Compat build key: " -#ifdef QT_BUILD_KEY_COMPAT - "| " QT_BUILD_KEY_COMPAT " " -#endif -#ifdef QT_BUILD_KEY_COMPAT2 - "| " QT_BUILD_KEY_COMPAT2 " " -#endif -#ifdef QT_BUILD_KEY_COMPAT3 - "| " QT_BUILD_KEY_COMPAT3 " " -#endif - "|\n" "Build date: %s\n" "Installation prefix: %s\n" "Library path: %s\n" diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index a8fb90968c..4dcd8e1e5e 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -59,7 +59,6 @@ public: static QString licensee(); static QString licensedProducts(); - static QString buildKey(); #ifndef QT_NO_DATESTRING static QDate buildDate(); #endif //QT_NO_DATESTRING |