drop functionality that may affect reproducible builds

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

CMakeLists.txt

@@ -59,8 +59,6 @@ set(KATIE_MINOR "9")
 set(KATIE_MICRO "0")
 set(KATIE_HEX "0x040900")
 set(KATIE_VERSION "${KATIE_MAJOR}.${KATIE_MINOR}.${KATIE_MICRO}")
-# this one is set via macro later, if possible. also used in config.cpp.cmake
-set(KATIE_GIT "unstable-${KATIE_VERSION}")
 
 # only for the build process
 if(CMAKE_SYSTEM_PROCESSOR)
@@ -82,11 +80,6 @@ endif()
 set(KATIE_COMPONENTS "Core Gui Declarative Designer Network Sql Svg Xml Script ScriptTools Test UiTools")
 set(KATIE_TOOLS "moc uic rcc designer qscript qtconfig")
 
-# for config.cpp.cmake
-string(TIMESTAMP KATIE_DATE "%Y-%m-%d")
-set(KATIE_LICENSE "Open Source")
-set(KATIE_PRODUCT "AwesomeSauce")
-
 include(GNUInstallDirs)
 set(KATIE_HEADERS_PATH "${CMAKE_INSTALL_FULL_INCLUDEDIR}/katie" CACHE PATH "Headers installation path")
 set(KATIE_LIBRARIES_PATH "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Libraries installation path")
@@ -979,7 +972,6 @@ katie_generate_obsolete(customwidget.h QtDesigner ../QtUiTools/customwidget.h)
 katie_generate_obsolete(qdesignercustomwidgetinterface.h QtDesigner ../QtUiTools/customwidget.h)
 
 katie_string_wrap("${KATIE_DEFINITIONS}" KATIE_DEFINITIONS)
-katie_git_checkout(KATIE_GIT)
 
 configure_file(
     ${CMAKE_SOURCE_DIR}/cmake/KatieConfig.cmake

cmake/KatieConfigVersion.cmake

@@ -3,9 +3,6 @@ set(KATIE_VERSION_MAJOR "@KATIE_MAJOR@")
 set(KATIE_VERSION_MINOR "@KATIE_MINOR@")
 set(KATIE_VERSION_PATCH "@KATIE_MICRO@")
 set(KATIE_VERSION "@KATIE_MAJOR@.@KATIE_MINOR@.@KATIE_MICRO@")
-# purely for convenience, bug reports and the like
-set(KATIE_VERSION_HEX "@KATIE_HEX@")
-set(KATIE_VERSION_GIT "@KATIE_GIT@")
 
 # Compatibility with find_package() query and version requirement
 set(PACKAGE_VERSION "${KATIE_VERSION}")

cmake/modules/KatieBuildMacros.cmake

@@ -178,29 +178,6 @@ function(KATIE_STRING_UNWRAP INSTR OUTLST)
     endif()
 endfunction()
 
-# a function to get the Git checkout hash and store it in a variable
-function(KATIE_GIT_CHECKOUT OUTSTR)
-    find_program(git NAMES git)
-    if(EXISTS "${CMAKE_SOURCE_DIR}/.git" AND NOT git)
-        message(WARNING "Git is not installed, unable to obtain checkout.\n")
-    else(EXISTS "${CMAKE_SOURCE_DIR}/.git")
-        execute_process(
-            COMMAND "${git}" rev-parse HEAD
-            WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-            RESULT_VARIABLE git_result
-            ERROR_VARIABLE git_output
-            OUTPUT_VARIABLE git_output
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-        )
-
-        if(NOT git_result STREQUAL 0)
-            message(WARNING "Git command failed, unable to obtain checkout:\n${git_output}")
-        else()
-            set(${OUTSTR} "${git_output}" PARENT_SCOPE)
-        endif()
-    endif()
-endfunction()
-
 # a macro to instruct katie_setup_target() which sources to exclude from the
 # all-in-one source file
 macro(KATIE_ALLINONE_EXCLUDE ARG1)

src/core/global/qconfig.cpp.cmake

@@ -31,12 +31,6 @@
 **
 ****************************************************************************/
 
-/* Build information */
-static const char* qt_configure_build_key_str          = "${KATIE_GIT}\0";
-static const char* qt_configure_build_date_str         = "${KATIE_DATE}\0";
-static const char* qt_configure_licensee_str           = "${KATIE_LICENSE}\0";
-static const char* qt_configure_licensed_products_str  = "${KATIE_PRODUCT}\0";
-
 /* Runtime paths */
 static const char* qt_configure_headers_path_str       = "${KATIE_HEADERS_PATH}\0";
 static const char* qt_configure_libraries_path_str     = "${KATIE_LIBRARIES_PATH}\0";

src/core/global/qlibraryinfo.cpp

@@ -46,18 +46,6 @@ QT_BEGIN_NAMESPACE
     key. This class provides an abstraction for accessing this
     information.
 
-    \table
-    \header \o Function           \o Return value
-    \row    \o buildKey()         \o A string that identifies the Katie version and
-                                     the configuration. This key is used to ensure
-                                     that \l{plugins} link against the same version
-                                     of Katie as the application.
-    \row    \o location()         \o The path to a certain Katie
-                                     component (e.g., documentation, header files).
-    \row    \o licensee(),
-               licensedProducts() \o Licensing information.
-    \endtable
-
     You can also use a \c Katie.conf file to override the hard-coded paths
     that are compiled into the Katie library. For more information, see
     the \l {Using Katie.conf} documentation.
@@ -70,8 +58,7 @@ QT_BEGIN_NAMESPACE
 
     \keyword library location
 
-    This enum type is used to specify a specific location
+    This enum type is used to specify a specific location specifier:
-    specifier:
 
     \value HeadersPath The location for all headers.
     \value LibrariesPath The location of installed libraries.
@@ -83,53 +70,6 @@ QT_BEGIN_NAMESPACE
     \sa location()
 */
 
-/*!
-  Returns the person to whom this build of Qt is licensed.
-
-  \sa licensedProducts()
-*/
-
-QString QLibraryInfo::licensee()
-{
-    return QString::fromLocal8Bit(qt_configure_licensee_str);
-}
-
-/*!
-  Returns the products that the license for this build of Qt has access to.
-
-  \sa licensee()
-*/
-
-QString QLibraryInfo::licensedProducts()
-{
-    return QString::fromLatin1(qt_configure_licensed_products_str);
-}
-
-/*!
-    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.
-
-    \sa location()
-*/
-
-QString QLibraryInfo::buildKey()
-{
-    return QString::fromLatin1(qt_configure_build_key_str);
-}
-
-/*!
-    \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.
-*/
-#ifndef QT_NO_DATESTRING
-QDate QLibraryInfo::buildDate()
-{
-    return QDate::fromString(QString::fromLatin1(qt_configure_build_date_str), Qt::ISODate);
-}
-#endif //QT_NO_DATESTRING
-
 /*!
   Returns the location specified by \a loc.
 

src/core/global/qlibraryinfo.h

@@ -35,7 +35,6 @@
 #define QLIBRARYINFO_H
 
 #include <QtCore/qstring.h>
-#include <QtCore/qdatetime.h>
 
 QT_BEGIN_HEADER
 
@@ -53,14 +52,6 @@ public:
         ImportsPath
     };
 
-    static QString licensee();
-    static QString licensedProducts();
-
-    static QString buildKey();
-#ifndef QT_NO_DATESTRING
-    static QDate buildDate();
-#endif //QT_NO_DATESTRING
-
     static QString location(LibraryLocation);
 
 private: