Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use KATIE_GIT as build-key and remove redundant QT_EDITION definition

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-12-18 18:57:29 +00:00
parent 88e1b7d04a
commit 34f2cfc804
6 changed files with 10 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -72,8 +72,8 @@ 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
set(KATIE_GIT "unknown")
# this one is set via macro later, if possible. also used in config.cpp.cmake
set(KATIE_GIT "unstable-${KATIE_VERSION}")
# components and tools that will be build, changed depending on the requirements availability
# NOTE: excluding DesignerComponents as it was never used as public component, currently only

2
cmake/KatieConfig.cmake
View file

@ -19,7 +19,6 @@
# KATIE_TOOLS_SUFFIX - tools suffix set when the project was build
# KATIE_COMPONENTS - components that were build
# KATIE_TOOLS - tools that were build
# KATIE_KEY - build key, used in plugins verification check
# avoiding use of return()
if(NOT KATIE_FOUND)
@ -57,7 +56,6 @@ if(NOT KATIE_FOUND)
set(KATIE_TOOLS_SUFFIX "@KATIE_TOOLS_SUFFIX@")
set(KATIE_MKSPECS_DIR "${CMAKE_CURRENT_LIST_DIR}/mkspecs")
set(KATIE_TYPE @KATIE_TYPE@)
set(KATIE_KEY "@KATIE_KEY@")
foreach(component ${KATIE_COMPONENTS})
string(TOUPPER ${component} uppercomp)

6
mkspecs/mkspecs.cmake
View file

@ -1,4 +1,4 @@
# KatieConfig overrides KATIE_TYPE and KATIE_KEY
# KatieConfig overrides KATIE_TYPE
if(NOT KATIE_TYPE)
set(KATIE_TYPE SHARED)
@ -90,10 +90,6 @@ if(NOT bsymbolic_functions_test OR NOT CMAKE_POSITION_INDEPENDENT_CODE)
katie_definition(-DQ_NO_DATA_RELOCATION)
endif()
if(NOT KATIE_KEY)
set(KATIE_KEY "${KATIE_ARCHITECTURE}-${KATIE_PLATFORM}-${KATIE_COMPILER}")
endif()
# Set compiler standard to C++ 11, appending to CMAKE_CXX_FLAGS is done so that try_compile() is
# also affected, which KDE uses for visibility check for an example
if(KATIE_COMPILER STREQUAL "gcc")

8
src/core/global/qconfig.cpp.cmake
View file

@ -39,13 +39,13 @@
**
****************************************************************************/
/* Installation date */
static const char* qt_configure_installation = "${KATIE_DATE}";
/* License Info */
/* 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_prefix_path_str = "${KATIE_PREFIX_FULL}\0";
static const char* qt_configure_headers_path_str = "${KATIE_HEADERS_FULL}\0";
static const char* qt_configure_libraries_path_str = "${KATIE_LIBRARIES_FULL}\0";

8
src/core/global/qconfig.h.cmake
View file

@ -93,14 +93,6 @@
/* Qt build specs */
#define QT_KATIE
#ifndef QT_EDITION
# define QT_EDITION QT_EDITION_DESKTOP
#endif
#ifndef QT_BUILD_KEY
# define QT_BUILD_KEY "${KATIE_KEY}"
#endif
#cmakedefine QT_VISIBILITY_AVAILABLE
#cmakedefine QT_LARGEFILE_SUPPORT ${QT_LARGEFILE_SUPPORT}
#cmakedefine QT_POINTER_SIZE ${QT_POINTER_SIZE}

7
src/core/global/qlibraryinfo.cpp
View file

@ -106,8 +106,7 @@ 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.
for establishing of two configurations are compatible.
\sa location()
*/
@ -115,7 +114,7 @@ QLibraryInfo::licensedProducts()
QString
QLibraryInfo::buildKey()
{
return QString::fromLatin1(QT_BUILD_KEY);
return QString::fromLatin1(qt_configure_build_key_str);
}
/*!
@ -127,7 +126,7 @@ QLibraryInfo::buildKey()
QDate
QLibraryInfo::buildDate()
{
return QDate::fromString(QString::fromLatin1(qt_configure_installation), Qt::ISODate);
return QDate::fromString(QString::fromLatin1(qt_configure_build_date_str), Qt::ISODate);
}
#endif //QT_NO_DATESTRING