whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update QLibraryInfo::build() to use the arch-detection from QSysInfo 

Change-Id: Ib6ece8d1a8de28222e719deb4e14c5191b46b19f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
bb10
Thiago Macieira 2014-03-22 23:38:53 -07:00 committed by The Qt Project
parent 82a6d37b99
commit b323473114
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/corelib/global/qlibraryinfo.cpp
View File

@ -1,6 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Copyright (C) 2014 Intel Corporation
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtCore module of the Qt Toolkit.
@ -67,6 +68,7 @@ QString qt_libraryInfoFile()
#endif
#include "qconfig.cpp"
#include "archdetect.cpp"
QT_BEGIN_NAMESPACE
@ -280,6 +282,12 @@ QLibraryInfo::buildDate()
#else
# define COMPILER_STRING "<unknown compiler>"
#endif
#ifdef QT_NO_DEBUG
# define DEBUG_STRING " release"
#else
# define DEBUG_STRING " debug"
#endif
#define QT_BUILD_STR "Qt " QT_VERSION_STR " (" __DATE__ "; " ARCH_FULL DEBUG_STRING " build; by " COMPILER_STRING ")"
/*!
Returns a string describing how this version of Qt was built.
@ -291,21 +299,7 @@ QLibraryInfo::buildDate()
const char *QLibraryInfo::build() Q_DECL_NOTHROW
{
static const char data[] = "Qt " QT_VERSION_STR " (" __DATE__ ", "
COMPILER_STRING ", "
#if QT_POINTER_SIZE == 4
"32"
#else
"64"
#endif
" bit, "
#ifdef QT_NO_DEBUG
"release"
#else
"debug"
#endif
" build)";
return data;
return QT_BUILD_STR;
}
/*!
@ -592,7 +586,7 @@ extern const char qt_core_interpreter[] __attribute__((section(".interp")))
extern "C" void qt_core_boilerplate();
void qt_core_boilerplate()
{
printf("This is the QtCore library version " QT_VERSION_STR "\n"
printf("This is the QtCore library version " QT_BUILD_STR "\n"
"Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).\n"
"Contact: http://www.qt-project.org/legal\n"
"\n"