From 7493ee1c44a16dc3b155a5bf3ed7ca966a71072a Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Wed, 31 Aug 2011 14:23:42 +0200 Subject: 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 Reviewed-by: Bradley T. Hughes --- tests/baselineserver/shared/baselineprotocol.cpp | 2 -- tests/baselineserver/shared/baselineprotocol.h | 1 - 2 files changed, 3 deletions(-) (limited to 'tests/baselineserver') diff --git a/tests/baselineserver/shared/baselineprotocol.cpp b/tests/baselineserver/shared/baselineprotocol.cpp index 630ca88e5b..9cbf67856d 100644 --- a/tests/baselineserver/shared/baselineprotocol.cpp +++ b/tests/baselineserver/shared/baselineprotocol.cpp @@ -56,7 +56,6 @@ const QString PI_HostAddress(QLS("HostAddress")); const QString PI_OSName(QLS("OSName")); const QString PI_OSVersion(QLS("OSVersion")); const QString PI_QtVersion(QLS("QtVersion")); -const QString PI_BuildKey(QLS("BuildKey")); const QString PI_GitCommit(QLS("GitCommit")); const QString PI_QMakeSpec(QLS("QMakeSpec")); const QString PI_PulseGitBranch(QLS("PulseGitBranch")); @@ -93,7 +92,6 @@ PlatformInfo PlatformInfo::localHostInfo() pi.insert(PI_HostName, QHostInfo::localHostName()); pi.insert(PI_QtVersion, QLS(qVersion())); pi.insert(PI_QMakeSpec, QString(QLS(QMAKESPEC)).remove(QRegExp(QLS("^.*mkspecs/")))); - pi.insert(PI_BuildKey, QLibraryInfo::buildKey()); #if defined(Q_OS_LINUX) pi.insert(PI_OSName, QLS("Linux")); QProcess uname; diff --git a/tests/baselineserver/shared/baselineprotocol.h b/tests/baselineserver/shared/baselineprotocol.h index 0b08e444fd..cc501e1d53 100644 --- a/tests/baselineserver/shared/baselineprotocol.h +++ b/tests/baselineserver/shared/baselineprotocol.h @@ -61,7 +61,6 @@ extern const QString PI_HostAddress; extern const QString PI_OSName; extern const QString PI_OSVersion; extern const QString PI_QtVersion; -extern const QString PI_BuildKey; extern const QString PI_GitCommit; extern const QString PI_QMakeSpec; extern const QString PI_PulseGitBranch; -- cgit v1.2.3